@livx.cc/appwrap 0.46.1 → 0.46.3

package/runtime-desktop/crates/webview-control/Cargo.lock

@@ -0,0 +1,330 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "bitflags"
+version = "2.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
+
+[[package]]
+name = "block2"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
+dependencies = [
+ "objc2",
+]
+
+[[package]]
+name = "dispatch2"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
+dependencies = [
+ "bitflags",
+ "objc2",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "libc"
+version = "0.2.186"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
+
+[[package]]
+name = "memchr"
+version = "2.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
+
+[[package]]
+name = "objc2"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
+dependencies = [
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2-app-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
+dependencies = [
+ "bitflags",
+ "block2",
+ "libc",
+ "objc2",
+ "objc2-cloud-kit",
+ "objc2-core-data",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-core-image",
+ "objc2-core-text",
+ "objc2-core-video",
+ "objc2-foundation",
+ "objc2-quartz-core",
+]
+
+[[package]]
+name = "objc2-cloud-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
+dependencies = [
+ "bitflags",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
+dependencies = [
+ "bitflags",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-foundation"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
+dependencies = [
+ "bitflags",
+ "dispatch2",
+ "objc2",
+]
+
+[[package]]
+name = "objc2-core-graphics"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
+dependencies = [
+ "bitflags",
+ "dispatch2",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-io-surface",
+]
+
+[[package]]
+name = "objc2-core-image"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-text"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
+dependencies = [
+ "bitflags",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+]
+
+[[package]]
+name = "objc2-core-video"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6"
+dependencies = [
+ "bitflags",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-io-surface",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
+
+[[package]]
+name = "objc2-foundation"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
+dependencies = [
+ "bitflags",
+ "block2",
+ "libc",
+ "objc2",
+ "objc2-core-foundation",
+]
+
+[[package]]
+name = "objc2-io-surface"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
+dependencies = [
+ "bitflags",
+ "objc2",
+ "objc2-core-foundation",
+]
+
+[[package]]
+name = "objc2-javascript-core"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a1e6550c4caed348956ce3370c9ffeca70bb1dbed4fa96112e7c6170e074586"
+dependencies = [
+ "objc2",
+ "objc2-core-foundation",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
+dependencies = [
+ "bitflags",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-security"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a"
+dependencies = [
+ "bitflags",
+ "objc2",
+ "objc2-core-foundation",
+]
+
+[[package]]
+name = "objc2-web-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f"
+dependencies = [
+ "bitflags",
+ "block2",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-core-foundation",
+ "objc2-foundation",
+ "objc2-javascript-core",
+ "objc2-security",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.150"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
+dependencies = [
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.118"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "webview-control"
+version = "0.1.0"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+ "objc2-web-kit",
+ "serde_json",
+]
+
+[[package]]
+name = "zmij"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"

package/runtime-desktop/crates/webview-control/Cargo.toml

@@ -0,0 +1,28 @@
+# webview-control — appwrap's generalized, automation-agnostic native webview primitive.
+# Carved out of src-tauri/src/bridge_mac.rs (Phase 1). Owns per-profile persistent+isolated
+# WKWebsiteDataStore windows, CSP-immune eval, snapshot, the bridgeShim WKScriptMessageHandler,
+# and the SSO-popup delegate (popup module). It emits RAW script-message payloads + RAW eval
+# results via callbacks — it holds NO bod-browser protocol / transport knowledge (that stays in
+# the control-channel adapter, bridge_mac.rs).
+#
+# objc2* versions MUST match src-tauri/Cargo.toml exactly — the same WKWebView pointer crosses the
+# crate boundary (pw.inner() as *mut WKWebView), so a version mismatch would make that cast UB.
+[package]
+name = "webview-control"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+# macOS-only today; a WebKitGtkBackend is a future slot behind the same seam (see ARCHITECTURE.md).
+name = "webview_control"
+path = "src/lib.rs"
+
+[dependencies]
+
+[target.'cfg(target_os = "macos")'.dependencies]
+serde_json = "1"
+objc2 = "0.6"
+objc2-foundation = "0.3"
+objc2-app-kit = "0.3"
+objc2-web-kit = "0.3"
+block2 = "0.6"

package/runtime-desktop/crates/webview-control/examples/host_harness.rs

@@ -0,0 +1,338 @@
+//! Phase-2 host harness — proves a live WKWebView tears off (ChildOf pane -> TopLevel window) and
+//! docks back (-> ChildOf pane) with page + WKWebsiteDataStore session (localStorage marker) +
+//! WKScriptMessageHandler bridge all intact, driven THROUGH the embedded in-process API
+//! (`webview_control::embedded::Controller`) — driving-adapter (a), no socket.
+//!
+//! Run: `cargo run --example host_harness`  (macOS; add `-- --hold` to keep windows up for a look).
+//!
+//! It is a minimal bare-AppKit host: it owns a pane NSView inside a plain NSWindow (mirroring what a
+//! Tauri pane / unclaw-app pane provides), serves a loopback page from an in-process HTTP server
+//! (opaque about:/data: origins can't use localStorage), then runs the assertion sequence and exits
+//! non-zero on any failure. The AppKit main runloop is pumped manually so each async step
+//! (callAsyncJavaScript / page load / bridge post) completes before the next.
+
+use std::cell::RefCell;
+use std::ffi::c_void;
+use std::io::{Read, Write};
+use std::net::TcpListener;
+use std::rc::Rc;
+use std::sync::mpsc::{channel, Receiver};
+use std::time::{Duration, Instant};
+
+use objc2::rc::Retained;
+use objc2::MainThreadMarker;
+use objc2_app_kit::{
+    NSApplication, NSApplicationActivationPolicy, NSBackingStoreType, NSView, NSWindow,
+    NSWindowStyleMask,
+};
+use objc2_foundation::{
+    NSDate, NSDefaultRunLoopMode, NSPoint, NSRect, NSRunLoop, NSSize, NSString,
+};
+
+use webview_control::embedded::Controller;
+use webview_control::{CreateSpec, Mount, ViewHandle};
+
+/// Pump the AppKit main runloop for up to `secs`, returning early once `done()` is true.
+fn pump_until(secs: f64, mut done: impl FnMut() -> bool) {
+    let rl = NSRunLoop::currentRunLoop();
+    let deadline = Instant::now() + Duration::from_secs_f64(secs);
+    while Instant::now() < deadline {
+        if done() {
+            return;
+        }
+        let until = NSDate::dateWithTimeIntervalSinceNow(0.05);
+        unsafe { rl.runMode_beforeDate(NSDefaultRunLoopMode, &until) };
+    }
+}
+
+fn pump(secs: f64) {
+    pump_until(secs, || false);
+}
+
+/// Synchronous eval through the embedded Controller: fire callAsyncJavaScript and pump until the
+/// completion block lands (or timeout). Returns the RAW return string.
+fn eval(ctrl: &Controller, mtm: MainThreadMarker, id: &str, js: &str) -> Result<String, String> {
+    let slot: Rc<RefCell<Option<Result<String, String>>>> = Rc::new(RefCell::new(None));
+    let s2 = slot.clone();
+    ctrl.eval_async(mtm, id, js.to_string(), move |r| *s2.borrow_mut() = Some(r));
+    pump_until(8.0, || slot.borrow().is_some());
+    let out = slot.borrow_mut().take();
+    out.unwrap_or(Err("eval timed out".into()))
+}
+
+/// Start a throwaway loopback HTTP server; returns its `http://127.0.0.1:PORT/` URL. The page just
+/// carries a stable title — the session marker is written via localStorage by the harness.
+fn start_loopback() -> String {
+    start_loopback_titled("HOST-HARNESS-PAGE")
+}
+
+/// Start a throwaway loopback HTTP server carrying `title` as its `<title>`; returns its URL.
+fn start_loopback_titled(title: &str) -> String {
+    let listener = TcpListener::bind("127.0.0.1:0").expect("bind loopback");
+    let addr = listener.local_addr().unwrap();
+    let title = title.to_string();
+    std::thread::spawn(move || {
+        let body = format!(
+            "<!doctype html><html><head><title>{title}</title></head>\
+            <body style=\"margin:0;background:#0b5;color:#fff;font:700 40px system-ui;\
+            display:flex;align-items:center;justify-content:center;height:100vh\">\
+            <div id=\"tag\">HOST-HARNESS-LIVE</div></body></html>"
+        );
+        for stream in listener.incoming() {
+            let Ok(mut s) = stream else { continue };
+            let mut buf = [0u8; 1024];
+            let _ = s.read(&mut buf);
+            let resp = format!(
+                "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}",
+                body.len(),
+                body
+            );
+            let _ = s.write_all(resp.as_bytes());
+        }
+    });
+    format!("http://{addr}/")
+}
+
+/// Read `location.href` once (pumping until the eval completes).
+fn href(ctrl: &Controller, mtm: MainThreadMarker, id: &str) -> String {
+    eval(ctrl, mtm, id, "return location.href;").unwrap_or_default()
+}
+
+/// Issue a nav op (idempotent — navigate/go_back/go_forward/reload can all be safely re-issued) and
+/// poll `location.href` until it contains `needle` or the deadline elapses. Re-issuing each iteration
+/// makes it robust to a WKWebView dropping a single async load request. Returns the last href.
+fn nav_settle(
+    ctrl: &Controller,
+    mtm: MainThreadMarker,
+    id: &str,
+    needle: &str,
+    secs: f64,
+    mut issue: impl FnMut(),
+) -> String {
+    let deadline = Instant::now() + Duration::from_secs_f64(secs);
+    let mut last = String::new();
+    while Instant::now() < deadline {
+        issue();
+        pump(0.4);
+        last = href(ctrl, mtm, id);
+        if last.contains(needle) {
+            return last;
+        }
+    }
+    last
+}
+
+fn main() {
+    let mtm = MainThreadMarker::new().expect("host_harness must run on the main thread");
+
+    // Scratch profile dir so we don't touch the real appwrap-desktop store.
+    let scratch = std::env::temp_dir().join(format!("webview-control-harness-{}", std::process::id()));
+    std::env::set_var("APPWRAP_PROFILE_DIR", &scratch);
+
+    // AppKit host app (accessory: no Dock icon; we pump the runloop manually rather than app.run()).
+    let app = NSApplication::sharedApplication(mtm);
+    app.setActivationPolicy(NSApplicationActivationPolicy::Accessory);
+    let _ = app.finishLaunching();
+
+    // The HOST-owned pane: a plain NSWindow whose content view is the container the tab docks into.
+    let pane_rect = NSRect::new(NSPoint::new(0.0, 0.0), NSSize::new(900.0, 640.0));
+    let style = NSWindowStyleMask::Titled | NSWindowStyleMask::Closable | NSWindowStyleMask::Resizable;
+    let pane_window = unsafe {
+        NSWindow::initWithContentRect_styleMask_backing_defer(
+            mtm.alloc::<NSWindow>(),
+            pane_rect,
+            style,
+            NSBackingStoreType::Buffered,
+            false,
+        )
+    };
+    unsafe {
+        pane_window.setReleasedWhenClosed(false);
+        pane_window.setTitle(&NSString::from_str("[host pane]"));
+    }
+    let pane = NSView::initWithFrame(mtm.alloc::<NSView>(), pane_rect);
+    pane_window.setContentView(Some(&pane));
+    pane_window.center();
+    pane_window.makeKeyAndOrderFront(None);
+    let pane_handle = unsafe { ViewHandle::from_ptr(Retained::as_ptr(&pane) as *mut c_void) };
+
+    let page_url = start_loopback();
+    let id = "harness-tab";
+    let ctrl = Controller::new();
+
+    // Bridge sink: the crate hands us RAW page->host payloads; capture them to prove the
+    // WKScriptMessageHandler survives reparenting.
+    let (tx, rx): (_, Receiver<String>) = channel();
+    let sink = Box::new(move |raw: String| {
+        let _ = tx.send(raw);
+    });
+
+    // (1) Create the tab as a CHILD of the host pane — an embedded in-app browser tab.
+    println!("== create_webview ChildOf(pane) id={id} url={page_url}");
+    let created = ctrl.create_webview(
+        mtm,
+        CreateSpec {
+            label: id.to_string(),
+            url: page_url.clone(),
+            profile_id: "harness".to_string(),
+            init_js: String::new(),
+            mount: Mount::ChildOf(pane_handle),
+        },
+        sink,
+    );
+    match &created {
+        Ok(c) => println!("   created: persistent={} store={}", c.persistent, c.store_uuid),
+        Err(e) => {
+            eprintln!("FAIL: create_webview: {e}");
+            std::process::exit(1);
+        }
+    }
+    pump(3.0); // let the page load
+
+    // (2) Write the session marker + capture page identity while CHILD.
+    let set = eval(
+        &ctrl,
+        mtm,
+        id,
+        "localStorage.setItem('marker','HOST-HARNESS-SESSION-77'); \
+         return JSON.stringify({href:location.href,title:document.title,marker:localStorage.getItem('marker')});",
+    );
+    println!("== child, marker set: {set:?}");
+
+    // (3) Bridge ping while CHILD.
+    let _ = eval(&ctrl, mtm, id, "webkit.messageHandlers.bridgeShim.postMessage('PING-CHILD'); return 'posted';");
+    pump(0.5);
+
+    // (4) TEAR OFF -> TopLevel window.
+    println!("== set_mount TopLevel (tear off)");
+    if !ctrl.set_mount(mtm, id, Mount::TopLevel) {
+        eprintln!("FAIL: set_mount TopLevel returned false");
+        std::process::exit(1);
+    }
+    pump(1.5);
+
+    // (5) DOCK BACK -> ChildOf(pane).
+    println!("== set_mount ChildOf(pane) (dock back)");
+    if !ctrl.set_mount(mtm, id, Mount::ChildOf(pane_handle)) {
+        eprintln!("FAIL: set_mount ChildOf returned false");
+        std::process::exit(1);
+    }
+    pump(1.5);
+
+    // (6) After child->toplevel->child: read page identity + marker back, and ping the bridge again.
+    let after = eval(
+        &ctrl,
+        mtm,
+        id,
+        "return JSON.stringify({href:location.href,title:document.title,marker:localStorage.getItem('marker')});",
+    );
+    println!("== after reparent cycle, read-back: {after:?}");
+    let _ = eval(&ctrl, mtm, id, "webkit.messageHandlers.bridgeShim.postMessage('PING-AFTER'); return 'posted';");
+    pump(0.5);
+
+    // ---- assertions ----
+    let after = match after {
+        Ok(s) => s,
+        Err(e) => {
+            eprintln!("FAIL: read-back eval error after reparent: {e}");
+            std::process::exit(1);
+        }
+    };
+    let page_ok = after.contains("HOST-HARNESS-PAGE"); // document.title preserved (page not reloaded/lost)
+    let session_ok = after.contains("HOST-HARNESS-SESSION-77"); // localStorage marker survived
+    let pings: Vec<String> = rx.try_iter().collect();
+    let bridge_ok = pings.iter().any(|p| p == "PING-CHILD") && pings.iter().any(|p| p == "PING-AFTER");
+
+    println!("\n---- Phase-2 embedded-API reparent assertions ----");
+    println!("page   survived (title HOST-HARNESS-PAGE): {page_ok}");
+    println!("session survived (marker 77):             {session_ok}");
+    println!("bridge  survived (pings {:?}):             {bridge_ok}", pings);
+
+    // ---- NAV ops (go_back / go_forward / reload via Controller) ----
+    // The tab is docked ChildOf(pane) on page 1. Navigate to a distinct page 2, then walk history.
+    let page1_href = href(&ctrl, mtm, id);
+    let page2_url = start_loopback_titled("HOST-HARNESS-PAGE-2");
+    println!("\n== NAV: navigate -> page2 {page2_url}");
+    let at2 = nav_settle(&ctrl, mtm, id, &page2_url, 10.0, || { let _ = ctrl.navigate(mtm, id, &page2_url); });
+    let nav_fwd_ok = at2.contains(&page2_url);
+    println!("   at page2: {at2:?} (ok={nav_fwd_ok})");
+
+    println!("== NAV: go_back -> page1");
+    let back1 = nav_settle(&ctrl, mtm, id, &page1_href, 10.0, || { let _ = ctrl.go_back(mtm, id); });
+    let nav_back_ok = back1 == page1_href && !page1_href.is_empty();
+    println!("   back at page1: {back1:?} (ok={nav_back_ok})");
+
+    println!("== NAV: go_forward -> page2");
+    let fwd2 = nav_settle(&ctrl, mtm, id, &page2_url, 10.0, || { let _ = ctrl.go_forward(mtm, id); });
+    let nav_fwd2_ok = fwd2.contains(&page2_url);
+    println!("   forward at page2: {fwd2:?} (ok={nav_fwd2_ok})");
+
+    println!("== NAV: reload (still page2, title present)");
+    let reloaded = nav_settle(&ctrl, mtm, id, &page2_url, 10.0, || { let _ = ctrl.reload(mtm, id); });
+    let title2 = eval(&ctrl, mtm, id, "return document.title;").unwrap_or_default();
+    let reload_ok = reloaded.contains(&page2_url) && title2.contains("HOST-HARNESS-PAGE-2");
+    println!("   after reload: href={reloaded:?} title={title2:?} (ok={reload_ok})");
+    let nav_ok = nav_fwd_ok && nav_back_ok && nav_fwd2_ok && reload_ok;
+
+    // ---- PROFILE SWAP: a second webview on a DIFFERENT profile → different store uuid ----
+    let first_store = created.as_ref().map(|c| c.store_uuid.clone()).unwrap_or_default();
+    let id_b = "harness-tab-b";
+    println!("\n== PROFILE SWAP: create id={id_b} profile=harnessB ChildOf(same pane)");
+    let created_b = ctrl.create_webview(
+        mtm,
+        CreateSpec {
+            label: id_b.to_string(),
+            url: page_url.clone(),
+            profile_id: "harnessB".to_string(),
+            init_js: String::new(),
+            mount: Mount::ChildOf(pane_handle),
+        },
+        Box::new(|_raw| {}),
+    );
+    let store_b = match &created_b {
+        Ok(c) => { println!("   harnessB store={}", c.store_uuid); c.store_uuid.clone() }
+        Err(e) => { eprintln!("FAIL: create harnessB: {e}"); std::process::exit(1); }
+    };
+    let profile_swap_ok = !first_store.is_empty() && store_b != first_store;
+    println!("   store isolation: harness={first_store} harnessB={store_b} (differ={profile_swap_ok})");
+    let _ = ctrl.close(mtm, id_b);
+    pump(0.3);
+
+    println!("\n---- nav + profile-swap assertions ----");
+    println!("nav ops (fwd/back/fwd/reload):               {nav_ok}");
+    println!("profile swap (distinct store uuid):          {profile_swap_ok}");
+
+    if std::env::args().any(|a| a == "--hold") {
+        println!("(--hold) leaving windows up 20s for inspection…");
+        pump(20.0);
+    }
+    // ---- zombie-close gate ----
+    // The tab is currently docked ChildOf(pane) (step 5/6). BEFORE close it is a subview of the host
+    // pane; AFTER close() the pane MUST have ZERO subviews — i.e. the WKWebView is actually gone from
+    // the host view tree, not left alive+visible as a zombie. This machine-gates the Phase-2 HIGH bug
+    // where close() only called window.close() and never removeFromSuperview() on the embedded webview.
+    let before_close = pane.subviews().count();
+    println!("\n== host pane subview count BEFORE close: {before_close} (expect 1: the docked tab)");
+    let _ = ctrl.close(mtm, id);
+    pump(0.5); // let AppKit settle the view-tree mutation
+    let after_close = pane.subviews().count();
+    println!("== host pane subview count AFTER close:  {after_close} (expect 0: tab detached)");
+    let pane_empty_ok = after_close == 0;
+
+    println!("pane empty after close (no zombie webview):  {pane_empty_ok}");
+
+    if page_ok && session_ok && bridge_ok && pane_empty_ok && nav_ok && profile_swap_ok {
+        println!("\nPASS: live webview reparented child->toplevel->child via EMBEDDED API; page+session+bridge intact; nav ops (back/forward/reload) + profile-swap (distinct store) verified; host pane empty after close.");
+    } else {
+        if !nav_ok { eprintln!("\nFAIL: nav ops (go_back/go_forward/reload) did not land as expected."); }
+        if !profile_swap_ok { eprintln!("\nFAIL: profile swap did not yield a distinct store uuid."); }
+        if !pane_empty_ok {
+            eprintln!(
+                "\nFAIL: ZOMBIE WEBVIEW — host pane still has {after_close} subview(s) after close(); \
+                 the embedded WKWebView was not removed from the host view tree."
+            );
+        }
+        eprintln!("\nFAIL: one or more invariants did not survive reparent.");
+        std::process::exit(1);
+    }
+}