@ape-egg/vibe 1.7.0 → 1.7.2

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## [1.7.2] - 2026-02-27
+
+### Fixed
+
+- **Component inlining — hyphenated custom elements inside slot content** (`find_matching_close`)
+  - `<component-card>`, `<component-grid>`, etc. inside slot content incorrectly matched `<component\b`, incrementing the depth counter without a corresponding close
+  - The real `</component>` could never bring the depth back to 0, so `find_matching_close` returned `None` and the outer component was left un-inlined (causing `Cannot GET /components/Layout.html` at runtime)
+  - Fixed by replacing `\b` with `(?:\s|>|/>)` — only matches actual `<component` tags followed by whitespace or `>`, not hyphenated variants
+
+---
+
+## [1.7.1] - 2026-02-27
+
+### Added
+
+- **Linux x64 binary** (`vibe-compiler-linux-x64`) — cross-compiled from macOS ARM using `musl-cross` and the `x86_64-unknown-linux-musl` Rust target
+  - Enables the compiler to run on Linux environments (e.g. Vercel, Docker, CI) without a local Rust toolchain
+  - New `compiler:build:linux` npm script builds the musl binary
+  - `publish:vibe:prepare` now builds both macOS ARM and Linux x64 binaries before publishing
+
+### Changed
+
+- **`reqwest` TLS backend** — switched from `native-tls` to `rustls-tls` with `default-features = false`
+  - Eliminates the OpenSSL dependency that prevented cross-compilation to `x86_64-unknown-linux-musl`
+  - Pure-Rust TLS implementation; no system libraries required
+
+---
+
 ## [1.7.0] - 2026-02-19
 
 ### Fixed
@@ -430,7 +458,7 @@
   - Helps explain total compilation time vs individual phase times
   - Displayed as: `* Validated components in XXms`
 - **Component tree output**: Improved verbose logging for component compilation
-  - Tree structure with nested dependencies (e.g., nav.html → top-of-nav.html, menu.html)
+  - Tree structure with nested dependencies (e.g., nav.html → menu.html)
   - Usage counts for each unique component
   - Color-coded: internal (green) vs external (magenta)
   - Summary format: `Compiled components (X internal, Y external)`

package/README.md

@@ -291,7 +291,6 @@ bunx vibe compile --minify --source-maps
 bunx vibe compile --verbose             # Step-by-step logging
 bunx vibe compile --minify              # Minify output
 bunx vibe compile --elements-as-is      # Keep custom elements as-is
-bunx vibe compile --validate            # Validate HTML syntax
 bunx vibe compile --source-maps         # Generate source maps
 bunx vibe compile --node-modules-as-is  # Copy node_modules as-is
 bunx vibe compile --components-as-is    # Skip component inlining
@@ -329,7 +328,6 @@ Add to your `package.json`:
     "elementsAsIs": false,
     "reservedElements": [],
     "sourceMaps": false,
-    "validate": false,
     "nodeModulesAsIs": false,
     "componentsAsIs": false,
     "runtimeAsIs": false,

package/compiler/src/Cargo.lock

@@ -302,22 +302,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
-[[package]]
-name = "errno"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
-dependencies = [
- "libc",
- "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
-
 [[package]]
 name = "file-id"
 version = "0.2.3"
@@ -350,21 +334,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.2"
@@ -454,14 +423,13 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.3.4"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if",
  "libc",
- "r-efi",
- "wasip2",
+ "wasi",
 ]
 
 [[package]]
@@ -598,16 +566,17 @@ dependencies = [
 ]
 
 [[package]]
-name = "hyper-tls"
-version = "0.5.0"
+name = "hyper-rustls"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
- "bytes",
+ "futures-util",
+ "http",
  "hyper",
- "native-tls",
+ "rustls",
  "tokio",
- "tokio-native-tls",
+ "tokio-rustls",
 ]
 
 [[package]]
@@ -825,12 +794,6 @@ dependencies = [
  "redox_syscall 0.7.1",
 ]
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
-
 [[package]]
 name = "litemap"
 version = "0.8.1"
@@ -919,23 +882,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "native-tls"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
-dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.6"
@@ -1025,50 +971,6 @@ version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
-[[package]]
-name = "openssl"
-version = "0.10.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
-dependencies = [
- "bitflags 2.10.0",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.114",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.111"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.12.5"
@@ -1162,12 +1064,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
-[[package]]
-name = "pkg-config"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
-
 [[package]]
 name = "potential_utf"
 version = "0.1.4"
@@ -1231,12 +1127,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "r-efi"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -1334,15 +1224,15 @@ dependencies = [
  "http",
  "http-body",
  "hyper",
- "hyper-tls",
+ "hyper-rustls",
  "ipnet",
  "js-sys",
  "log",
  "mime",
- "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
+ "rustls",
  "rustls-pemfile",
  "serde",
  "serde_json",
@@ -1350,15 +1240,30 @@ dependencies = [
  "sync_wrapper",
  "system-configuration",
  "tokio",
- "tokio-native-tls",
+ "tokio-rustls",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
+ "webpki-roots",
  "winreg",
 ]
 
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "rquickjs"
 version = "0.6.2"
@@ -1393,16 +1298,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
-name = "rustix"
-version = "1.1.3"
+name = "rustls"
+version = "0.21.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
- "bitflags 2.10.0",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.61.2",
+ "log",
+ "ring",
+ "rustls-webpki",
+ "sct",
 ]
 
 [[package]]
@@ -1414,6 +1318,16 @@ dependencies = [
  "base64",
 ]
 
+[[package]]
+name = "rustls-webpki"
+version = "0.101.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.22"
@@ -1435,15 +1349,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "schannel"
-version = "0.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
-dependencies = [
- "windows-sys 0.61.2",
-]
-
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
@@ -1457,26 +1362,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
-name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.10.0",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.15.0"
+name = "sct"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
 dependencies = [
- "core-foundation-sys",
- "libc",
+ "ring",
+ "untrusted",
 ]
 
 [[package]]
@@ -1849,19 +1741,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "tempfile"
-version = "3.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c"
-dependencies = [
- "fastrand",
- "getrandom",
- "once_cell",
- "rustix",
- "windows-sys 0.61.2",
-]
-
 [[package]]
 name = "tendril"
 version = "0.4.3"
@@ -1918,12 +1797,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
+name = "tokio-rustls"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "native-tls",
+ "rustls",
  "tokio",
 ]
 
@@ -2017,6 +1896,12 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
 [[package]]
 name = "url"
 version = "2.5.8"
@@ -2047,12 +1932,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -2061,7 +1940,7 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "vibe-compiler"
-version = "1.7.0"
+version = "1.7.2"
 dependencies = [
  "clap",
  "colored",
@@ -2109,15 +1988,6 @@ version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
-[[package]]
-name = "wasip2"
-version = "1.0.2+wasi-0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
-dependencies = [
- "wit-bindgen",
-]
-
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.108"
@@ -2187,6 +2057,12 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.25.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
+
 [[package]]
 name = "winapi-util"
 version = "0.1.11"
@@ -2443,12 +2319,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "wit-bindgen"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
-
 [[package]]
 name = "writeable"
 version = "0.6.2"

package/compiler/src/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vibe-compiler"
-version = "1.7.0"
+version = "1.7.2"
 edition = "2021"
 description = "Vibe framework compiler - compiles Vibe source files into optimized output"
 authors = ["Kim Korte"]
@@ -20,7 +20,7 @@ markup5ever = "0.12"
 thiserror = "1.0"
 regex = "1.10"
 colored = "2.1"
-reqwest = { version = "0.11", features = ["blocking"] }
+reqwest = { version = "0.11", features = ["blocking", "rustls-tls"], default-features = false }
 glob = "0.3"
 rquickjs = "0.6"
 swc_common = "=0.40.1"

package/compiler/src/compiler/compile.rs

@@ -488,17 +488,15 @@ impl Compiler {
             }
         }
 
-        // Validate HTML syntax if requested (optional, controlled by validate flag)
-        if self.config.validate {
-            let validation_start = Instant::now();
-            if self.verbose {
-                println!("\nValidating HTML syntax...");
-            }
-            self.validate_html_syntax()?;
-            stats.validation_time_ms = Some(validation_start.elapsed().as_secs_f64() * 1000.0);
-            if self.verbose {
-                println!("  HTML validation completed successfully");
-            }
+        // Validate HTML syntax (always runs)
+        let validation_start = Instant::now();
+        if self.verbose {
+            println!("\nValidating HTML syntax...");
+        }
+        self.validate_html_syntax()?;
+        stats.validation_time_ms = Some(validation_start.elapsed().as_secs_f64() * 1000.0);
+        if self.verbose {
+            println!("  HTML validation completed successfully");
         }
 
         // Clean output directory if not in no-clean mode
@@ -644,6 +642,13 @@ impl Compiler {
         }
 
         for file_path in files {
+            // Validate HTML before compiling (same as full compile path)
+            let content = fs::read_to_string(file_path).map_err(|e| CompileError::ReadError {
+                path: file_path.display().to_string(),
+                source: e,
+            })?;
+            self.validate_html(&content, file_path)?;
+
             // Calculate relative path
             let relative_path = file_path
                 .strip_prefix(&self.config.source)
@@ -807,29 +812,19 @@ impl Compiler {
         source_root: &Path,
     ) -> Result<(), String> {
         use crate::compiler::manifest_builder::ManifestBuilder;
-        use crate::compiler::value_stamper::ValueStamper;
         use crate::compiler::component_tagger::ComponentTagger;
+        use crate::compiler::value_stamper::ValueStamper;
 
         // Tag components with deterministic IDs and structure state
         let tagged = ComponentTagger::tag_components(html, &source_root.to_path_buf())?;
         let html = &tagged.html;  // Use modified HTML with data-vibe-component-id attributes
         let state = tagged.state;
 
-        // Build manifest from ORIGINAL HTML (before stamping, so templates have @[...] markers)
+        // Build manifest from pre-stamp HTML (both conditional branches present, @[...] markers intact)
+        // This ensures restoration.template has both branches so runtime can switch between them
         let manifest_builder = ManifestBuilder::new();
         let manifest = manifest_builder.build_from_html(html, &state, iterations_as_is)?;
 
-        // Stamp values (pre-render) AFTER building manifest
-        // When components_as_is is true, skip stamping inside component elements (runtime will handle them)
-        let stamper = ValueStamper::new(&state, components_as_is)?;
-        let pre_rendered = stamper.stamp_html(html.to_string())?;
-
-        // Note: FOUC removal happens in compile_html_file(), not here
-
-        // Write pre-rendered HTML
-        fs::write(html_path, pre_rendered)
-            .map_err(|e| format!("Failed to write HTML: {}", e))?;
-
         // Write manifest
         let manifest_path = output_dir
             .join("vibe-hyperspeed")
@@ -853,6 +848,20 @@ impl Compiler {
         fs::write(&manifest_path, manifest_js)
             .map_err(|e| format!("Failed to write manifest: {}", e))?;
 
+        // Stamp the compiled HTML with initial state values for FOUC prevention:
+        // - @[...] bindings replaced with their initial values
+        // - Only the active conditional branch is kept (inactive branch stripped)
+        // - Iterations are pre-rendered with initial array data
+        // The manifest (written above) preserves BOTH branches so the runtime can
+        // restore them and switch between branches reactively.
+        let stamper = ValueStamper::new(&state, components_as_is)
+            .map_err(|e| format!("Failed to create value stamper: {}", e))?;
+        let stamped = stamper.stamp_html(html.to_string())
+            .map_err(|e| format!("Failed to stamp HTML: {}", e))?;
+
+        fs::write(html_path, stamped)
+            .map_err(|e| format!("Failed to write stamped HTML: {}", e))?;
+
         Ok(())
     }
 
@@ -1097,11 +1106,6 @@ impl Compiler {
             source: e,
         })?;
 
-        // Validate if requested
-        if self.config.validate {
-            self.validate_html(&content, path)?;
-        }
-
         // Count <component src="..."> instances before processing (only if not components_as_is)
         let (internal_count, external_count, component_srcs) = if !self.config.components_as_is {
             self.extract_components(&content)
@@ -1531,8 +1535,8 @@ impl Compiler {
     }
 
     fn validate_html(&self, content: &str, path: &Path) -> Result<(), CompileError> {
+        // Check 1: Quote balance per line
         let mut line_num = 1;
-
         for line in content.lines() {
             let quote_count = line.matches('"').count();
             if quote_count % 2 != 0 {
@@ -1545,9 +1549,77 @@ impl Compiler {
             line_num += 1;
         }
 
+        // Check 2: Tag balance (unclosed elements break slot extraction)
+        self.validate_tag_balance(content, path)
+    }
+
+    fn validate_tag_balance(&self, content: &str, path: &Path) -> Result<(), CompileError> {
+        const VOID_ELEMENTS: &[&str] = &[
+            "area", "base", "br", "col", "embed", "hr", "img", "input",
+            "link", "meta", "param", "source", "track", "wbr",
+        ];
+        // These are implicitly closed by the parser — don't require explicit close tags
+        const IMPLICIT_CLOSE: &[&str] = &[
+            "html", "head", "body", "p", "li", "dt", "dd", "option",
+            "optgroup", "tr", "td", "th", "thead", "tbody", "tfoot", "colgroup",
+        ];
+
+        // Strip comments, raw content blocks, and @[...] bindings before tag scanning
+        let stripped = Self::strip_for_tag_validation(content);
+
+        // Match any tag: opening, self-closing, or closing
+        let tag_re = Regex::new(r"</?([a-zA-Z][a-zA-Z0-9-]*)(?:\s[^>]*)?>").unwrap();
+
+        // Count opens vs closes per tag name; track line of first open for error reporting
+        let mut counts: HashMap<String, (i32, usize)> = HashMap::new();
+        for cap in tag_re.captures_iter(&stripped) {
+            let full = cap.get(0).unwrap().as_str();
+            let name = cap[1].to_lowercase();
+            if VOID_ELEMENTS.contains(&name.as_str()) || IMPLICIT_CLOSE.contains(&name.as_str()) {
+                continue;
+            }
+            if full.starts_with("</") {
+                counts.entry(name).and_modify(|(c, _)| *c -= 1);
+            } else if full.ends_with("/>") {
+                // self-closing — no balance change
+            } else {
+                let offset = cap.get(0).unwrap().start();
+                let line = stripped[..offset].matches('\n').count() + 1;
+                let entry = counts.entry(name).or_insert((0, line));
+                entry.0 += 1;
+            }
+        }
+
+        // Report the first unclosed tag (sorted by line for deterministic output)
+        let mut unclosed: Vec<(String, usize)> = counts.into_iter()
+            .filter(|(_, (count, _))| *count > 0)
+            .map(|(name, (_, line))| (name, line))
+            .collect();
+        unclosed.sort_by_key(|(_, line)| *line);
+
+        if let Some((name, line)) = unclosed.first() {
+            return Err(CompileError::ValidationError {
+                file: path.display().to_string(),
+                line: *line,
+                message: format!("Unclosed tag <{}>", name),
+            });
+        }
+
         Ok(())
     }
 
+    fn strip_for_tag_validation(content: &str) -> String {
+        // Strip HTML comments <!-- ... --> (includes Vibe syntax: each, if, else, /if, /each)
+        let comment_re = Regex::new(r"(?s)<!--.*?-->").unwrap();
+        let s = comment_re.replace_all(content, "");
+        // Strip @[...] reactive bindings (can contain < and > characters)
+        let binding_re = Regex::new(r"@\[[^\]]*\]").unwrap();
+        let s = binding_re.replace_all(&s, "");
+        // Strip content inside <script>, <style>, <pre> to avoid parsing embedded code as HTML
+        let raw_re = Regex::new(r"(?si)(<(?:script|style|pre)(?:\s[^>]*)?>).*?(</(?:script|style|pre)>)").unwrap();
+        raw_re.replace_all(&s, "$1$2").into_owned()
+    }
+
     /// Copy an entire directory recursively
     fn copy_directory(
         &mut self,

package/compiler/src/compiler/component_tagger.rs

@@ -127,46 +127,55 @@ impl ComponentTagger {
             if is_component || is_div_component {
                 drop(borrowed_attrs); // Release borrow before checking innerHTML
 
-                // First check if this component has state-registering scripts
-                // Serialize this node's children to get innerHTML
-                let mut inner_html_bytes = Vec::new();
+                // Only extract state from DIRECT <script> children — not the full subtree.
+                // Using the full subtree caused the Layout wrapper (a <component> created by
+                // inline_component_elements that contains all nested component scripts) to be
+                // treated as a stateful component with the merged state of all its descendants.
+                // That made rewrite_this_to_component_id rewrite every @[this.xxx] in the page
+                // to @[_c0.xxx] before child components could claim their own bindings.
+                let mut direct_scripts_html = String::new();
                 for child in node.children.borrow().iter() {
-                    let _ = serialize(
-                        &mut inner_html_bytes,
-                        &SerializableHandle::from(child.clone()),
-                        SerializeOpts::default()
-                    );
+                    if let NodeData::Element { name: ref child_name, .. } = child.data {
+                        if child_name.local.as_ref() == "script" {
+                            let mut script_bytes = Vec::new();
+                            let _ = serialize(
+                                &mut script_bytes,
+                                &SerializableHandle::from(child.clone()),
+                                SerializeOpts::default()
+                            );
+                            if let Ok(script_str) = String::from_utf8(script_bytes) {
+                                direct_scripts_html.push_str(&script_str);
+                            }
+                        }
+                    }
                 }
 
-                if let Ok(inner_html) = String::from_utf8(inner_html_bytes) {
-                    // Extract state from component's innerHTML
-                    if let Ok(Value::Object(comp_state)) = StateExtractor::extract_from_html(
-                        &inner_html,
-                        &PathBuf::from(".")
-                    ) {
-                        // Only tag and register components that have state
-                        if !comp_state.is_empty() {
-                            let component_id = format!("_c{}", *counter.borrow());
-                            *counter.borrow_mut() += 1;
-
-                            // Add data-vibe-component-id attribute
-                            let mut attrs_mut = attrs.borrow_mut();
-                            attrs_mut.push(markup5ever::Attribute {
-                                name: QualName::new(
-                                    None,
-                                    Namespace::from(""),
-                                    LocalName::from("data-vibe-component-id"),
-                                ),
-                                value: component_id.clone().into(),
-                            });
-                            drop(attrs_mut);
-
-                            // Rewrite this.property to componentId.property in the node's children
-                            // This allows ValueStamper to properly evaluate component-scoped expressions
-                            Self::rewrite_this_to_component_id(node, &component_id);
-
-                            component_states.borrow_mut().push((component_id, Value::Object(comp_state)));
-                        }
+                if let Ok(Value::Object(comp_state)) = StateExtractor::extract_from_html(
+                    &direct_scripts_html,
+                    &PathBuf::from(".")
+                ) {
+                    // Only tag and register components that have state
+                    if !comp_state.is_empty() {
+                        let component_id = format!("_c{}", *counter.borrow());
+                        *counter.borrow_mut() += 1;
+
+                        // Add data-vibe-component-id attribute
+                        let mut attrs_mut = attrs.borrow_mut();
+                        attrs_mut.push(markup5ever::Attribute {
+                            name: QualName::new(
+                                None,
+                                Namespace::from(""),
+                                LocalName::from("data-vibe-component-id"),
+                            ),
+                            value: component_id.clone().into(),
+                        });
+                        drop(attrs_mut);
+
+                        // Rewrite this.property to componentId.property in the node's children
+                        // This allows ValueStamper to properly evaluate component-scoped expressions
+                        Self::rewrite_this_to_component_id(node, &component_id);
+
+                        component_states.borrow_mut().push((component_id, Value::Object(comp_state)));
                     }
                 }
             }

package/compiler/src/config.rs

@@ -31,8 +31,6 @@ pub struct VibeCompilerConfig {
     #[serde(default)]
     pub elements_as_is: bool,
     #[serde(default)]
-    pub validate: bool,
-    #[serde(default)]
     pub source_maps: bool,
     #[serde(default)]
     pub reserved_elements: Vec<String>,
@@ -96,7 +94,6 @@ impl Default for VibeCompilerConfig {
             root: None,
             minify: false,
             elements_as_is: false,
-            validate: false,
             source_maps: false,
             reserved_elements: vec![],
             node_modules_as_is: false,
@@ -121,7 +118,6 @@ pub struct Config {
     pub _root: Option<String>,
     pub minify: bool,
     pub elements_as_is: bool,
-    pub validate: bool,
     pub source_maps: bool,
     pub reserved_elements: Vec<String>,
     pub node_modules_as_is: bool,
@@ -169,7 +165,6 @@ impl Config {
             _root: config.root,
             minify: config.minify,
             elements_as_is: config.elements_as_is,
-            validate: config.validate,
             source_maps: config.source_maps,
             reserved_elements,
             node_modules_as_is: config.node_modules_as_is,

package/compiler/src/main.rs

@@ -14,7 +14,6 @@ use compiler::Compiler;
 struct ConfigOverrides {
     minify: bool,
     elements_as_is: bool,
-    validate: bool,
     source_maps: bool,
     node_modules_as_is: bool,
     components_as_is: bool,
@@ -53,10 +52,6 @@ struct Args {
     #[arg(long, name = "source-maps")]
     source_maps: bool,
 
-    /// Validate HTML syntax
-    #[arg(long)]
-    validate: bool,
-
     /// Initialize configuration in package.json
     #[arg(long)]
     init: bool,
@@ -127,7 +122,6 @@ fn main() {
     // Store original config values before applying flag overrides
     let original_minify = config.minify;
     let original_elements_as_is = config.elements_as_is;
-    let original_validate = config.validate;
     let original_source_maps = config.source_maps;
     let original_node_modules_as_is = config.node_modules_as_is;
     let original_components_as_is = config.components_as_is;
@@ -145,10 +139,6 @@ fn main() {
         overrides.elements_as_is = !original_elements_as_is;
         config.elements_as_is = true;
     }
-    if args.validate {
-        overrides.validate = !original_validate;
-        config.validate = true;
-    }
     if args.source_maps {
         overrides.source_maps = !original_source_maps;
         config.source_maps = true;
@@ -229,7 +219,6 @@ fn main() {
         println!("  {}: {}", format!("{:<16}", "runtimeAsIs").cyan(), format_bool_with_flag(config.runtime_as_is, overrides.runtime_as_is, original_runtime_as_is));
         println!("  {}: {}", format!("{:<16}", "source").cyan(), format_value_no_flag(&config._source_str));
         println!("  {}: {}", format!("{:<16}", "sourceMaps").cyan(), format_bool_with_flag(config.source_maps, overrides.source_maps, original_source_maps));
-        println!("  {}: {}", format!("{:<16}", "validate").cyan(), format_bool_with_flag(config.validate, overrides.validate, original_validate));
         println!();
     } else {
         // Show version in non-verbose mode

package/compiler/src/parser/html.rs

@@ -255,6 +255,65 @@ impl HtmlParser {
     /// Recursively inline all <component> elements with their HTML content
     /// Inline a single component (one pass, no looping)
     /// Used during recursive component fetching to resolve nested components
+    /// Find the start position of the matching close tag, handling nesting of the same tag.
+    /// `after_open`: byte position immediately after the `>` of the opening tag.
+    fn find_matching_close(content: &str, after_open: usize, tag_name: &str) -> Option<usize> {
+        // (?:\s|>) ensures <component> matches but not <component-foo> (hyphen is not \s or >)
+        let open_re = regex::Regex::new(&format!(r"<{}(?:\s|>|/>)", regex::escape(tag_name))).unwrap();
+        let close_re = regex::Regex::new(&format!(r"</{}>", regex::escape(tag_name))).unwrap();
+
+        let mut depth = 1i32;
+        let mut cursor = after_open;
+
+        while cursor < content.len() {
+            let slice = &content[cursor..];
+            let next_open = open_re.find(slice).map(|m| (m.start(), m.end()));
+            let next_close = close_re.find(slice).map(|m| (m.start(), m.end()));
+
+            match (next_open, next_close) {
+                (None, None) => return None,
+                (None, Some((cs, ce))) => {
+                    depth -= 1;
+                    if depth == 0 { return Some(cursor + cs); }
+                    cursor += ce;
+                }
+                (Some((os, oe)), None) => {
+                    // Check if self-closing by finding the end of this tag
+                    if let Some(end) = slice[os..].find('>') {
+                        if slice[os..os + end + 1].ends_with("/>") {
+                            cursor += os + end + 1;
+                        } else {
+                            depth += 1;
+                            cursor += oe;
+                        }
+                    } else {
+                        return None;
+                    }
+                }
+                (Some((os, oe)), Some((cs, ce))) => {
+                    if os < cs {
+                        if let Some(end) = slice[os..].find('>') {
+                            if slice[os..os + end + 1].ends_with("/>") {
+                                cursor += os + end + 1;
+                            } else {
+                                depth += 1;
+                                cursor += oe;
+                            }
+                        } else {
+                            return None;
+                        }
+                    } else {
+                        depth -= 1;
+                        if depth == 0 { return Some(cursor + cs); }
+                        cursor += ce;
+                    }
+                }
+            }
+        }
+
+        None
+    }
+
     pub fn inline_single_component(&self, content: &str, component_src: &str, component_content: &str) -> String {
         let mut result = content.to_string();
 
@@ -270,55 +329,53 @@ impl HtmlParser {
             }
         };
 
-        // Match <component src="..." attrs...>children</component>
-        // OR <div class="component" src="..." attrs...>children</div>
-        let pattern = format!(r#"(?s)<(component|div)\s+([^>]*)\bsrc="{}"\s*([^>]*)>(.*?)</(component|div)>"#, regex::escape(&normalized_src));
-        let component_re = regex::Regex::new(&pattern).unwrap();
+        // Match only the opening tag — slot content is extracted via depth-counting close search
+        // to correctly handle slot content that contains </div> or nested <component> elements.
+        let pattern = format!(r#"<(component|div)\s+([^>]*)\bsrc="{}"\s*([^>]*)>"#, regex::escape(&normalized_src));
+        let open_re = regex::Regex::new(&pattern).unwrap();
 
-        let matches: Vec<_> = component_re.captures_iter(&result).map(|cap| {
-            let full_match = cap.get(0).unwrap();
+        let matches: Vec<_> = open_re.captures_iter(&result).filter_map(|cap| {
+            let open_tag = cap.get(0).unwrap();
             let tag_name = cap.get(1).unwrap().as_str();
             let attrs_before = cap.get(2).map(|m| m.as_str()).unwrap_or("");
             let attrs_after = cap.get(3).map(|m| m.as_str()).unwrap_or("");
-            let slot_content = cap.get(4).map(|m| m.as_str().to_string());
 
             // For <div>, verify it has class="component"
             if tag_name == "div" {
                 let combined_attrs = format!("{} {}", attrs_before, attrs_after);
                 if !combined_attrs.contains("class=") || !combined_attrs.contains("component") {
-                    return None; // Not a component div, skip
+                    return None;
                 }
             }
 
-            // Combine all attributes
+            let open_end = open_tag.end();
+            let close_start = Self::find_matching_close(&result, open_end, tag_name)?;
+            let close_end = close_start + format!("</{}>", tag_name).len();
+            let slot_content = result[open_end..close_start].to_string();
+
             let attrs_str = format!("{} {}", attrs_before, attrs_after);
             let props = Self::parse_props(&attrs_str);
 
-            Some((full_match.start(), full_match.end(), props, slot_content))
-        }).flatten().collect();
+            Some((open_tag.start(), close_end, props, slot_content))
+        }).collect();
+
+        // Replace from end to start (sorted descending by start position)
+        let mut sorted = matches;
+        sorted.sort_by(|a, b| b.0.cmp(&a.0));
 
-        // Replace from end to start
-        for (start, end, props, slot_content) in matches.iter().rev() {
+        for (start, end, props, slot_content) in &sorted {
             let mut replacement = component_content.to_string();
 
-            // Replace props
             for (prop_name, prop_value) in props {
                 let prop_binding = format!("@[{}]", prop_name);
                 replacement = replacement.replace(&prop_binding, prop_value);
             }
 
-            // Replace slots
-            let slot_replacement = slot_content
-                .as_ref()
-                .filter(|s| !s.trim().is_empty())
-                .map(|s| s.as_str())
-                .unwrap_or("");
-
+            let slot_replacement = if slot_content.trim().is_empty() { "" } else { slot_content.as_str() };
             replacement = replacement.replace("<slot></slot>", slot_replacement);
             replacement = replacement.replace("<slot/>", slot_replacement);
             replacement = replacement.replace("<slot />", slot_replacement);
 
-            // Keep the <component> wrapper
             let wrapper = format!("<component>{}</component>", replacement);
             result.replace_range(*start..*end, &wrapper);
         }
@@ -329,73 +386,81 @@ impl HtmlParser {
     fn inline_component_elements(&self, content: &str, external_cache: &HashMap<String, String>) -> String {
         let mut result = content.to_string();
 
-        // Single pass - all components in cache are already fully resolved
-        // Match <component src="..." attrs...>children</component>
-        // OR <div class="component" src="..." attrs...>children</div> (after accessibility transformation)
-        // Both signatures require src attribute (wrappers without src are already processed)
-        let component_re = regex::Regex::new(
-            r#"(?s)<(component|div)\s+([^>]*)\bsrc="([^"]+)"([^>]*)>(.*?)</(component|div)>"#
+        // Match only the opening component tag — slot content is extracted via depth-counting
+        // to correctly handle slot content containing </div> or nested <component> elements.
+        let open_re = regex::Regex::new(
+            r#"<(component|div)\s+([^>]*)\bsrc="([^"]+)"([^>]*)>"#
         ).unwrap();
 
-        let matches: Vec<_> = component_re.captures_iter(&result).map(|cap| {
-            let full_match = cap.get(0).unwrap();
-            let tag_name = cap.get(1).unwrap().as_str();
-            let attrs_before = cap.get(2).map(|m| m.as_str()).unwrap_or("");
-            let src = cap.get(3).unwrap().as_str();
-            let attrs_after = cap.get(4).map(|m| m.as_str()).unwrap_or("");
-            let slot_content = cap.get(5).map(|m| m.as_str().to_string());
-
-            // For <div>, verify it has class="component" (or class="component other-classes")
-            if tag_name == "div" {
-                let combined_attrs = format!("{} {}", attrs_before, attrs_after);
-                if !combined_attrs.contains("class=") || !combined_attrs.contains("component") {
-                    return None; // Not a component div, skip
+        // Process one match at a time with re-scanning after each replacement.
+        // This is required for nested components (e.g. Layout.html wrapping inner components):
+        // collecting all byte positions at once and applying them in reverse fails because
+        // replacing an inner component changes the string length, invalidating the outer
+        // component's end byte position and causing a char boundary panic.
+        loop {
+            let matches: Vec<_> = open_re.captures_iter(&result).filter_map(|cap| {
+                let open_tag = cap.get(0).unwrap();
+                let tag_name = cap.get(1).unwrap().as_str();
+                let attrs_before = cap.get(2).map(|m| m.as_str()).unwrap_or("");
+                let src = cap.get(3).unwrap().as_str();
+                let attrs_after = cap.get(4).map(|m| m.as_str()).unwrap_or("");
+
+                // For <div>, verify it has class="component"
+                if tag_name == "div" {
+                    let combined_attrs = format!("{} {}", attrs_before, attrs_after);
+                    if !combined_attrs.contains("class=") || !combined_attrs.contains("component") {
+                        return None;
+                    }
                 }
-            }
 
-            // Combine all attributes (excluding src which we already extracted)
-            let attrs_str = format!("{} {}", attrs_before, attrs_after);
-            let props = Self::parse_props(&attrs_str);
+                let open_end = open_tag.end();
+                let close_start = Self::find_matching_close(&result, open_end, tag_name)?;
+                let close_end = close_start + format!("</{}>", tag_name).len();
+                let slot_content = result[open_end..close_start].to_string();
 
-            Some((full_match.start(), full_match.end(), src.to_string(), props, slot_content))
-        }).flatten().collect();
+                let attrs_str = format!("{} {}", attrs_before, attrs_after);
+                let props = Self::parse_props(&attrs_str);
 
-        // Replace from end to start
-        for (start, end, src, props, slot_content) in matches.iter().rev() {
-            // Normalize path
-            let normalized_src = if src.starts_with("http://") || src.starts_with("https://") {
-                src.to_string()
-            } else {
-                let without_prefix = src.trim_start_matches("./");
-                if without_prefix.starts_with('/') {
-                    without_prefix.to_string()
+                Some((open_tag.start(), close_end, src.to_string(), props, slot_content))
+            }).collect();
+
+            // Pick the rightmost match that has a cached component and apply it, then re-scan.
+            let mut sorted = matches;
+            sorted.sort_by(|a, b| b.0.cmp(&a.0));
+
+            let mut applied = false;
+            for (start, end, src, props, slot_content) in sorted {
+                let normalized_src = if src.starts_with("http://") || src.starts_with("https://") {
+                    src.to_string()
                 } else {
-                    format!("/{}", without_prefix)
-                }
-            };
-
-            // Get fully resolved component from cache
-            if let Some(mut replacement) = external_cache.get(&normalized_src).cloned() {
-                // Replace props
-                for (prop_name, prop_value) in props {
-                    let prop_binding = format!("@[{}]", prop_name);
-                    replacement = replacement.replace(&prop_binding, prop_value);
-                }
+                    let without_prefix = src.trim_start_matches("./");
+                    if without_prefix.starts_with('/') {
+                        without_prefix.to_string()
+                    } else {
+                        format!("/{}", without_prefix)
+                    }
+                };
 
-                // Replace slots
-                let slot_replacement = slot_content
-                    .as_ref()
-                    .filter(|s| !s.trim().is_empty())
-                    .map(|s| s.as_str())
-                    .unwrap_or("");
+                if let Some(mut replacement) = external_cache.get(&normalized_src).cloned() {
+                    for (prop_name, prop_value) in &props {
+                        let prop_binding = format!("@[{}]", prop_name);
+                        replacement = replacement.replace(&prop_binding, prop_value);
+                    }
+
+                    let slot_replacement = if slot_content.trim().is_empty() { "" } else { slot_content.as_str() };
+                    replacement = replacement.replace("<slot></slot>", slot_replacement);
+                    replacement = replacement.replace("<slot/>", slot_replacement);
+                    replacement = replacement.replace("<slot />", slot_replacement);
 
-                replacement = replacement.replace("<slot></slot>", slot_replacement);
-                replacement = replacement.replace("<slot/>", slot_replacement);
-                replacement = replacement.replace("<slot />", slot_replacement);
+                    let wrapper = format!("<component>{}</component>", replacement);
+                    result.replace_range(start..end, &wrapper);
+                    applied = true;
+                    break;
+                }
+            }
 
-                // Keep the <component> wrapper (without src attribute)
-                let wrapper = format!("<component>{}</component>", replacement);
-                result.replace_range(*start..*end, &wrapper);
+            if !applied {
+                break;
             }
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ape-egg/vibe",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "type": "module",
   "description": "Runtime-first reactivity with optional compiler",
   "main": "index.js",

package/runtime/component.js

@@ -60,8 +60,10 @@ export const processComponent = (rootElement, onComplete, config = {}) => {
 
   const src = el.getAttribute('src');
 
-  // Capture children and props before fetching
-  const children = el.innerHTML.trim();
+  // Use pre-hydration slot content if available (saved by index.js before hydration ran),
+  // otherwise fall back to current innerHTML (e.g. runtime-only usage without boot).
+  const children = (el._vibeSlotContent !== undefined ? el._vibeSlotContent : el.innerHTML).trim();
+  delete el._vibeSlotContent;
   const props = {};
   Array.from(el.attributes).forEach((attr) => {
     if (attr.name !== 'src') {

package/runtime/index.js

@@ -454,6 +454,13 @@ const main = (s, config = {}, stringSelector = '') => {
     restoreMarkersFromManifest(rootElement, cloneForRestoration, hyperspeedTree);
   }
 
+  // Save raw slot content of fetched components before hydration replaces @[...] markers.
+  // component.js captures el.innerHTML when resolving — if hydration already ran, the
+  // binding syntax is gone and the resolved component won't be reactive.
+  rootElement.querySelectorAll('component[src], div.component[src]').forEach(el => {
+    el._vibeSlotContent = el.innerHTML;
+  });
+
   // Runtime parses DOM (which now has restored markers if hyperspeed was used)
   let parsedTree = parse(rootElement);
 

package/runtime/pre-compiled-manifest.js

@@ -467,8 +467,12 @@ export const restoreMarkersFromManifest = (
 
             if (text.startsWith("if")) {
               if (!startComment) {
-                startComment = comment;
-                conditionalDepth = 1;
+                const expression = childTree.meta?.expression;
+                const expectedText = expression ? 'if ' + expression : null;
+                if (expectedText && text === expectedText) {
+                  startComment = comment;
+                  conditionalDepth = 1;
+                }
               } else {
                 // Track nested conditionals
                 conditionalDepth++;