bunite-core 0.12.0 → 0.14.0

package/src/native/mac/bunite_mac_ffi.mm

@@ -20,7 +20,7 @@ using bunite_mac::runOnUiThreadSync;
 
 namespace {
 
-constexpr int32_t kBuniteAbiVersion = 5;
+constexpr int32_t kBuniteAbiVersion = 9;
 
 // warn-once — avoid log spam from tight JS call loops.
 #define BUNITE_MAC_TODO(name)                                       \
@@ -273,13 +273,83 @@ extern "C" BUNITE_EXPORT void bunite_view_execute_javascript(uint32_t view_id, c
   });
 }
 
-extern "C" BUNITE_EXPORT void bunite_view_evaluate(uint32_t view_id, uint32_t request_id, const char* /*script*/) {
-  // Stage A: macOS evaluate not yet implemented. Report not_supported so the
-  // JS side's whenReady() resolves with a structured envelope.
-  std::string payload = "{\"requestId\":" + std::to_string(request_id) +
-                        ",\"ok\":false,\"code\":\"not_supported\","
-                        "\"message\":\"macOS evaluate not implemented (Stage A: Windows only)\"}";
-  bunite_mac::emitWebviewEvent(view_id, "evaluate-result", payload);
+extern "C" BUNITE_EXPORT void bunite_view_evaluate(uint32_t view_id, uint32_t request_id, const char* script) {
+  // Wrapper matches WebView2/CEF: try/catch returns JSON envelope string.
+  // WKWebView's `evaluateJavaScript:` delivers the string directly (no outer
+  // re-stringify), so the inner envelope is the completion result.
+  if (!script) {
+    std::string payload = "{\"requestId\":" + std::to_string(request_id) +
+                          ",\"ok\":false,\"code\":\"runtime_error\","
+                          "\"message\":\"null script\"}";
+    bunite_mac::emitWebviewEvent(view_id, "evaluate-result", payload);
+    return;
+  }
+  std::string wrapped =
+      "(function(){try{return JSON.stringify({__bunite_ok:true,value:("
+      + std::string(script) +
+      ")})}catch(e){var c=(e&&e.name===\"SecurityError\")?\"cross_origin\":\"runtime_error\";"
+      "return JSON.stringify({__bunite_ok:false,code:c,"
+      "message:(e&&e.message)?e.message:String(e),"
+      "name:(e&&e.name)||\"\"})}})()";
+  NSString* nsScript = [NSString stringWithUTF8String:wrapped.c_str()];
+  runOnUiThreadSync([=]() {
+    auto* v = bunite_mac::findView(view_id);
+    if (!v || !v->webview) {
+      std::string payload = "{\"requestId\":" + std::to_string(request_id) +
+                            ",\"ok\":false,\"code\":\"not_supported\","
+                            "\"message\":\"view not ready\"}";
+      bunite_mac::emitWebviewEvent(view_id, "evaluate-result", payload);
+      return;
+    }
+    [v->webview evaluateJavaScript:nsScript completionHandler:^(id result, NSError* error) {
+      std::string payload = "{\"requestId\":" + std::to_string(request_id);
+      if (error) {
+        std::string msg = error.localizedDescription.UTF8String ?: "evaluate failed";
+        payload += ",\"ok\":false,\"code\":\"runtime_error\","
+                   "\"message\":\"" + bunite_mac::escapeJsonString(msg) + "\"}";
+      } else if (![result isKindOfClass:[NSString class]]) {
+        payload += ",\"ok\":false,\"code\":\"runtime_error\","
+                   "\"message\":\"wrapper returned non-string\"}";
+      } else {
+        std::string inner = ((NSString*)result).UTF8String ?: "";
+        if (inner.find("\"__bunite_ok\":true") != std::string::npos) {
+          static const std::string prefix = "{\"__bunite_ok\":true,\"value\":";
+          std::string value_json = "null";
+          if (inner.compare(0, prefix.size(), prefix) == 0 &&
+              inner.size() > prefix.size() + 1) {
+            value_json = inner.substr(prefix.size(), inner.size() - prefix.size() - 1);
+          }
+          payload += ",\"ok\":true,\"value\":\"" + bunite_mac::escapeJsonString(value_json) + "\"}";
+        } else {
+          // Anchor extraction at the fixed envelope prefix — user-controlled
+          // e.message could otherwise inject a fake "code" via substring match.
+          static const std::string codePrefix = "{\"__bunite_ok\":false,\"code\":\"";
+          std::string code = "runtime_error";
+          std::string msg = "script threw";
+          if (inner.compare(0, codePrefix.size(), codePrefix) == 0) {
+            size_t start = codePrefix.size();
+            size_t end = start;
+            while (end < inner.size() && inner[end] != '"') ++end;
+            if (end > start) code = inner.substr(start, end - start);
+            static const std::string msgKey = "\",\"message\":\"";
+            if (end + msgKey.size() <= inner.size() &&
+                inner.compare(end, msgKey.size(), msgKey) == 0) {
+              size_t mstart = end + msgKey.size();
+              size_t mend = mstart;
+              while (mend < inner.size()) {
+                if (inner[mend] == '"' && (mend == mstart || inner[mend - 1] != '\\')) break;
+                ++mend;
+              }
+              if (mend > mstart) msg = inner.substr(mstart, mend - mstart);
+            }
+          }
+          payload += ",\"ok\":false,\"code\":\"" + bunite_mac::escapeJsonString(code) + "\","
+                     "\"message\":\"" + bunite_mac::escapeJsonString(msg) + "\"}";
+        }
+      }
+      bunite_mac::emitWebviewEvent(view_id, "evaluate-result", payload);
+    }];
+  });
 }
 
 extern "C" BUNITE_EXPORT void bunite_view_load_url(uint32_t view_id, const char* url) {
@@ -443,6 +513,284 @@ extern "C" BUNITE_EXPORT void bunite_view_remove(uint32_t view_id) {
   runOnUiThreadSync([=]() { bunite_mac::removeView(view_id); });
 }
 
+// Input dispatch — synthesized NSEvent + window sendEvent: (full responder chain).
+// `isTrusted` is false (synthetic), so `nativeInputTrusted` capability stays false.
+namespace {
+
+NSEventModifierFlags macModifiers(uint32_t bits) {
+  NSEventModifierFlags m = 0;
+  if (bits & 8) m |= NSEventModifierFlagShift;
+  if (bits & 2) m |= NSEventModifierFlagControl;
+  if (bits & 1) m |= NSEventModifierFlagOption;
+  if (bits & 4) m |= NSEventModifierFlagCommand;
+  return m;
+}
+
+NSEventType macMouseDownType(int32_t button) {
+  switch (button) {
+    case 1: return NSEventTypeOtherMouseDown;
+    case 2: return NSEventTypeRightMouseDown;
+    default: return NSEventTypeLeftMouseDown;
+  }
+}
+NSEventType macMouseUpType(int32_t button) {
+  switch (button) {
+    case 1: return NSEventTypeOtherMouseUp;
+    case 2: return NSEventTypeRightMouseUp;
+    default: return NSEventTypeLeftMouseUp;
+  }
+}
+
+// FFI x/y is CSS px in top-left view space; convert to AppKit window coords.
+// WKWebView is non-flipped, so y flips against bounds.height.
+NSPoint viewPointToWindow(NSView* view, double x, double y) {
+  NSRect bounds = view.bounds;
+  NSPoint local = view.isFlipped ? NSMakePoint(x, y) : NSMakePoint(x, bounds.size.height - y);
+  return [view convertPoint:local toView:nil];
+}
+
+}  // namespace
+
+extern "C" BUNITE_EXPORT void bunite_view_click(uint32_t view_id, double x, double y,
+                                                  int32_t button, int32_t click_count, uint32_t modifiers) {
+  if (click_count < 1) click_count = 1;
+  runOnUiThreadSync([=]() {
+    auto* v = bunite_mac::findView(view_id);
+    if (!v || !v->webview || !v->webview.window) return;
+    NSWindow* win = v->webview.window;
+    NSPoint loc = viewPointToWindow(v->webview, x, y);
+    // Strip the Control bit from mouse-event modifierFlags: AppKit converts
+    // Ctrl+leftMouseDown into a secondary click (context-menu modal),
+    // deadlocking the cooperative pump. Page-side `ctrlKey` will read false
+    // for ctrl-click on mac as a result — callers needing ctrl-click should
+    // wrap with explicit `press("Control")` keydown/keyup.
+    NSEventModifierFlags flags = macModifiers(modifiers) & ~NSEventModifierFlagControl;
+    // dblclick parity: ascending clickCount per pair. Dispatch directly to
+    // the WKWebView — `[win sendEvent:]` enters AppKit's modal mouse-tracking
+    // loop and deadlocks the cooperative pump.
+    for (int i = 1; i <= click_count; ++i) {
+      NSEvent* down = [NSEvent mouseEventWithType:macMouseDownType(button)
+                                         location:loc modifierFlags:flags
+                                        timestamp:[[NSProcessInfo processInfo] systemUptime]
+                                     windowNumber:win.windowNumber context:nil
+                                      eventNumber:0 clickCount:i pressure:1.0];
+      NSEvent* up = [NSEvent mouseEventWithType:macMouseUpType(button)
+                                       location:loc modifierFlags:flags
+                                      timestamp:[[NSProcessInfo processInfo] systemUptime]
+                                   windowNumber:win.windowNumber context:nil
+                                    eventNumber:0 clickCount:i pressure:0.0];
+      // Dispatch directly to WKWebView — `[NSApp sendEvent:]` would translate
+      // Ctrl+leftMouseDown into rightMouseDown (AppKit's emulated secondary
+      // click), entering the context-menu modal run-loop mode and stalling
+      // the cooperative pump indefinitely.
+      if (down) {
+        if (button == 0)      [v->webview mouseDown:down];
+        else if (button == 2) [v->webview rightMouseDown:down];
+        else                  [v->webview otherMouseDown:down];
+      }
+      if (up) {
+        if (button == 0)      [v->webview mouseUp:up];
+        else if (button == 2) [v->webview rightMouseUp:up];
+        else                  [v->webview otherMouseUp:up];
+      }
+    }
+  });
+}
+
+extern "C" BUNITE_EXPORT void bunite_view_type(uint32_t view_id, const char* text) {
+  std::string s = text ? text : "";
+  runOnUiThreadSync([=]() {
+    auto* v = bunite_mac::findView(view_id);
+    if (!v || !v->webview) return;
+    NSString* ns = [NSString stringWithUTF8String:s.c_str()];
+    if (!ns.length) return;
+    // WKWebView conforms to NSTextInputClient — insertText: routes through
+    // its IME chain so DOM input events fire on focused editable elements.
+    if ([v->webview respondsToSelector:@selector(insertText:)]) {
+      [(id)v->webview insertText:ns];
+    }
+  });
+}
+
+extern "C" BUNITE_EXPORT void bunite_view_press(uint32_t view_id, int32_t /*windows_vk_code*/,
+                                                  int32_t mac_key_code, const char* /*key*/, const char* /*code*/,
+                                                  const char* character, uint32_t modifiers,
+                                                  int32_t action, bool /*extended*/, int32_t /*location*/) {
+  std::string char_str = character ? character : "";
+  runOnUiThreadSync([=]() {
+    auto* v = bunite_mac::findView(view_id);
+    if (!v || !v->webview || !v->webview.window) return;
+    NSString* chars = char_str.empty() ? @"" : [NSString stringWithUTF8String:char_str.c_str()];
+    NSEventModifierFlags flags = macModifiers(modifiers);
+    NSWindow* win = v->webview.window;
+    if (action != 1) {
+      NSEvent* down = [NSEvent keyEventWithType:NSEventTypeKeyDown
+                                       location:NSZeroPoint modifierFlags:flags
+                                      timestamp:[[NSProcessInfo processInfo] systemUptime]
+                                   windowNumber:win.windowNumber context:nil
+                                     characters:chars charactersIgnoringModifiers:chars
+                                      isARepeat:NO keyCode:(unsigned short)mac_key_code];
+      if (down) [v->webview keyDown:down];
+    }
+    if (action != 0) {
+      NSEvent* up = [NSEvent keyEventWithType:NSEventTypeKeyUp
+                                     location:NSZeroPoint modifierFlags:flags
+                                    timestamp:[[NSProcessInfo processInfo] systemUptime]
+                                 windowNumber:win.windowNumber context:nil
+                                   characters:chars charactersIgnoringModifiers:chars
+                                    isARepeat:NO keyCode:(unsigned short)mac_key_code];
+      if (up) [v->webview keyUp:up];
+    }
+  });
+}
+
+extern "C" BUNITE_EXPORT void bunite_view_scroll(uint32_t view_id, double dx, double dy,
+                                                   double x, double y, uint32_t modifiers) {
+  runOnUiThreadSync([=]() {
+    auto* v = bunite_mac::findView(view_id);
+    if (!v || !v->webview || !v->webview.window) return;
+    CGEventRef cg = CGEventCreateScrollWheelEvent(NULL, kCGScrollEventUnitPixel, 2,
+                                                  static_cast<int32_t>(-dy),
+                                                  static_cast<int32_t>(-dx));
+    if (!cg) return;
+    // CGEvent location is screen coords; CSS px → window → screen.
+    NSPoint inWin = viewPointToWindow(v->webview, x, y);
+    NSPoint onScreen = [v->webview.window convertPointToScreen:inWin];
+    CGEventSetLocation(cg, CGPointMake(onScreen.x, onScreen.y));
+    CGEventSetFlags(cg, (CGEventFlags)macModifiers(modifiers));
+    NSEvent* ev = [NSEvent eventWithCGEvent:cg];
+    CFRelease(cg);
+    if (ev) [v->webview scrollWheel:ev];
+  });
+}
+
+extern "C" BUNITE_EXPORT void bunite_view_respond_dialog(uint32_t view_id, uint32_t request_id,
+                                                          bool accept, const char* text) {
+  std::string text_str = text ? text : "";
+  runOnUiThreadSync([=]() {
+    auto* v = bunite_mac::findView(view_id);
+    if (!v) return;
+    auto it = v->pending_dialogs.find(request_id);
+    if (it == v->pending_dialogs.end()) return;
+    auto cb = it->second;
+    v->pending_dialogs.erase(it);
+    if (cb) cb(accept, text_str);
+  });
+}
+
+extern "C" BUNITE_EXPORT void bunite_view_mouse(uint32_t view_id, int32_t action,
+                                                  double x, double y, int32_t button,
+                                                  uint32_t modifiers) {
+  runOnUiThreadSync([=]() {
+    auto* v = bunite_mac::findView(view_id);
+    if (!v || !v->webview || !v->webview.window) return;
+    NSWindow* win = v->webview.window;
+    NSPoint loc = viewPointToWindow(v->webview, x, y);
+    // Strip Control bit on mouse events for the same reason as click —
+    // AppKit Ctrl+leftMouseDown maps to secondary-click which enters context
+    // menu modal mode and stalls the cooperative pump.
+    NSEventModifierFlags flags = macModifiers(modifiers) & ~NSEventModifierFlagControl;
+    NSEventType type;
+    if (action == 0) {
+      type = NSEventTypeMouseMoved;
+    } else if (action == 1) {
+      type = macMouseDownType(button);
+    } else {
+      type = macMouseUpType(button);
+    }
+    NSEvent* ev = [NSEvent mouseEventWithType:type
+                                     location:loc modifierFlags:flags
+                                    timestamp:[[NSProcessInfo processInfo] systemUptime]
+                                 windowNumber:win.windowNumber context:nil
+                                  eventNumber:0 clickCount:(action == 0 ? 0 : 1)
+                                     pressure:(action == 1 ? 1.0 : 0.0)];
+    if (!ev) return;
+    // Direct WKWebView dispatch — same modal-tracking concerns as click.
+    if (action == 0) {
+      [v->webview mouseMoved:ev];
+    } else if (action == 1) {
+      if (button == 0) [v->webview mouseDown:ev];
+      else if (button == 1) [v->webview otherMouseDown:ev];
+      else [v->webview rightMouseDown:ev];
+    } else {
+      if (button == 0) [v->webview mouseUp:ev];
+      else if (button == 1) [v->webview otherMouseUp:ev];
+      else [v->webview rightMouseUp:ev];
+    }
+  });
+}
+
+// Screenshot — WKWebView.takeSnapshotWithConfiguration: + NSBitmapImageRep PNG/JPEG.
+namespace {
+
+void emitMacScreenshotError(uint32_t view_id, uint32_t request_id, const char* code, NSString* msg) {
+  std::string m = msg ? (msg.UTF8String ?: "") : "";
+  std::string payload = "{\"requestId\":" + std::to_string(request_id) +
+                        ",\"ok\":false,\"code\":\"" + code + "\","
+                        "\"message\":\"" + bunite_mac::escapeJsonString(m) + "\"}";
+  bunite_mac::emitWebviewEvent(view_id, "screenshot-result", payload);
+}
+
+}  // namespace
+
+extern "C" BUNITE_EXPORT uint32_t bunite_view_capabilities(uint32_t view_id) {
+  // WKWebView — synthetic NSEvent dispatched directly to the view. Empirically
+  // WebKit marks these events `isTrusted=true` on the page (the synthesis bit
+  // matters for AppKit responder routing, not for the DOM trust flag).
+  auto* v = bunite_mac::findView(view_id);
+  if (!v) return 0;
+  return BUNITE_CAP_EVALUATE | BUNITE_CAP_SURFACE_EVENTS |
+         BUNITE_CAP_NATIVE_INPUT_TRUSTED |
+         BUNITE_CAP_CLICK | BUNITE_CAP_TYPE | BUNITE_CAP_PRESS | BUNITE_CAP_SCROLL |
+         BUNITE_CAP_MOUSE | BUNITE_CAP_DIALOGS | BUNITE_CAP_CONSOLE |
+         BUNITE_CAP_SCREENSHOT | BUNITE_CAP_FORMAT_PNG | BUNITE_CAP_FORMAT_JPEG;
+}
+
+extern "C" BUNITE_EXPORT void bunite_view_screenshot(uint32_t view_id, uint32_t request_id,
+                                                       const char* format, int32_t quality) {
+  std::string fmt = format ? format : "png";
+  runOnUiThreadSync([=]() {
+    auto* v = bunite_mac::findView(view_id);
+    if (!v || !v->webview) {
+      emitMacScreenshotError(view_id, request_id, "not_supported", @"view not ready");
+      return;
+    }
+    WKSnapshotConfiguration* cfg = [[WKSnapshotConfiguration alloc] init];
+    cfg.afterScreenUpdates = YES;
+    const bool jpeg = (fmt == "jpeg" || fmt == "jpg");
+    NSString* outFmt = jpeg ? @"jpeg" : @"png";
+    NSString* mime = jpeg ? @"image/jpeg" : @"image/png";
+    [v->webview takeSnapshotWithConfiguration:cfg
+                            completionHandler:^(NSImage* img, NSError* err) {
+      if (err || !img) {
+        emitMacScreenshotError(view_id, request_id, "runtime_error", err ? err.localizedDescription : @"takeSnapshot returned nil");
+        return;
+      }
+      CGImageRef cgImg = [img CGImageForProposedRect:nullptr context:nil hints:nil];
+      if (!cgImg) {
+        emitMacScreenshotError(view_id, request_id, "runtime_error", @"CGImageForProposedRect failed");
+        return;
+      }
+      NSBitmapImageRep* rep = [[NSBitmapImageRep alloc] initWithCGImage:cgImg];
+      NSDictionary* props = jpeg
+        ? @{ NSImageCompressionFactor: @((quality < 0 ? 0.9 : std::min(quality, 100) / 100.0)) }
+        : @{};
+      NSData* data = [rep representationUsingType:(jpeg ? NSBitmapImageFileTypeJPEG : NSBitmapImageFileTypePNG)
+                                       properties:props];
+      if (!data || data.length == 0) {
+        emitMacScreenshotError(view_id, request_id, "runtime_error", @"encode failed");
+        return;
+      }
+      NSString* b64 = [data base64EncodedStringWithOptions:0];
+      std::string payload = "{\"requestId\":" + std::to_string(request_id) +
+                            ",\"ok\":true,\"format\":\"" + outFmt.UTF8String +
+                            "\",\"mime\":\"" + mime.UTF8String +
+                            "\",\"dataBase64\":\"" + (b64.UTF8String ?: "") + "\"}";
+      bunite_mac::emitWebviewEvent(view_id, "screenshot-result", payload);
+    }];
+  });
+}
+
 extern "C" BUNITE_EXPORT void bunite_view_open_devtools(uint32_t view_id) {
   runOnUiThreadSync([=]() {
     if (@available(macOS 13.3, *)) {

package/src/native/mac/bunite_mac_internal.h

@@ -61,6 +61,12 @@ struct ViewState {
   // HTML stashed by load_html; appres handler serves at internal/index.html.
   std::string stored_html;
   std::vector<std::string> navigation_rules;
+
+  // Page-initiated dialogs awaiting host response (alert/confirm/prompt).
+  // WKUIDelegate completion handlers are held in `__strong` blocks until
+  // respondToDialog invokes them; the page execution is paused meanwhile.
+  std::unordered_map<uint32_t, void(^)(bool /*accept*/, const std::string& /*text*/)> pending_dialogs;
+  uint32_t next_dialog_request_id = 1;
 };
 
 // ---------------------------------------------------------------------------

package/src/native/mac/bunite_mac_utils.mm

@@ -100,8 +100,8 @@ std::vector<std::string> parseNavigationRulesJson(NSString* json) {
 }
 
 bool shouldAlwaysAllowNavigationUrl(const std::string& url) {
-  return url == "about:blank" ||
-         url.rfind("appres://app.internal/internal/", 0) == 0;
+  // Exact-match — prefix would let `../../evil` style paths bypass scrutiny.
+  return url == "about:blank" || url == "appres://app.internal/internal/index.html";
 }
 
 bool shouldAllowNavigation(const ViewState* view, const std::string& url) {

package/src/native/mac/bunite_mac_view.mm

@@ -49,14 +49,77 @@ decidePolicyForNavigationAction:(WKNavigationAction*)action
   decisionHandler(allow ? WKNavigationActionPolicyAllow : WKNavigationActionPolicyCancel);
 }
 
-- (void)webView:(WKWebView*)wv didFinishNavigation:(WKNavigation*)nav {
+- (void)webView:(WKWebView*)wv didStartProvisionalNavigation:(WKNavigation*)nav {
   (void)nav;
   uint32_t view_id = bunite_mac::viewIdForWebView(wv);
   NSString* url = wv.URL.absoluteString ?: @"";
+  bunite_mac::emitWebviewEvent(view_id, "load-start", url.UTF8String);
+}
+
+- (void)webView:(WKWebView*)wv didCommitNavigation:(WKNavigation*)nav {
+  (void)nav;
+  uint32_t view_id = bunite_mac::viewIdForWebView(wv);
+  NSString* url = wv.URL.absoluteString ?: @"";
+  // URL commit point — surfaceEvents `navigate` arm. WKWebView fires this
+  // when the document begins loading after server response (post-redirect).
   bunite_mac::emitWebviewEvent(view_id, "did-navigate", url.UTF8String);
+}
+
+- (void)webView:(WKWebView*)wv didFinishNavigation:(WKNavigation*)nav {
+  (void)nav;
+  uint32_t view_id = bunite_mac::viewIdForWebView(wv);
+  NSString* url = wv.URL.absoluteString ?: @"";
+  bunite_mac::emitWebviewEvent(view_id, "load-finish", url.UTF8String);
   bunite_mac::emitWebviewEvent(view_id, "dom-ready", url.UTF8String);
 }
 
+- (void)webView:(WKWebView*)wv didFailNavigation:(WKNavigation*)nav withError:(NSError*)error {
+  (void)nav;
+  uint32_t view_id = bunite_mac::viewIdForWebView(wv);
+  NSString* url = wv.URL.absoluteString ?: @"";
+  std::string payload = "{\"url\":\"" + bunite_mac::escapeJsonString(url.UTF8String ?: "") +
+                        "\",\"reason\":\"" + bunite_mac::escapeJsonString(error.localizedDescription.UTF8String ?: "") + "\"}";
+  bunite_mac::emitWebviewEvent(view_id, "load-fail", payload);
+}
+
+- (void)webView:(WKWebView*)wv didFailProvisionalNavigation:(WKNavigation*)nav withError:(NSError*)error {
+  (void)nav;
+  uint32_t view_id = bunite_mac::viewIdForWebView(wv);
+  NSString* failingUrl = ((NSURL*)error.userInfo[NSURLErrorFailingURLErrorKey]).absoluteString
+                       ?: (wv.URL.absoluteString ?: @"");
+  std::string payload = "{\"url\":\"" + bunite_mac::escapeJsonString(failingUrl.UTF8String ?: "") +
+                        "\",\"reason\":\"" + bunite_mac::escapeJsonString(error.localizedDescription.UTF8String ?: "") + "\"}";
+  bunite_mac::emitWebviewEvent(view_id, "load-fail", payload);
+}
+
+@end
+
+@interface BuniteTitleObserver : NSObject
++ (instancetype)shared;
+@end
+
+@implementation BuniteTitleObserver
++ (instancetype)shared {
+  static BuniteTitleObserver* o = nil;
+  static dispatch_once_t once;
+  dispatch_once(&once, ^{ o = [[BuniteTitleObserver alloc] init]; });
+  return o;
+}
+- (void)observeValueForKeyPath:(NSString*)keyPath
+                      ofObject:(id)object
+                        change:(NSDictionary<NSKeyValueChangeKey, id>*)change
+                       context:(void*)context
+{
+  (void)change; (void)context;
+  if (![keyPath isEqualToString:@"title"]) return;
+  WKWebView* wv = (WKWebView*)object;
+  uint32_t view_id = bunite_mac::viewIdForWebView(wv);
+  if (!view_id) return;
+  NSString* title = wv.title ?: @"";
+  std::string payload = "{\"title\":\"" +
+    bunite_mac::escapeJsonString(title.UTF8String ?: "") + "\"}";
+  bunite_mac::emitWebviewEvent(view_id, "title-changed", payload);
+}
 @end
 
 @interface BuniteUIDelegate : NSObject <WKUIDelegate>
@@ -79,6 +142,80 @@ createWebViewWithConfiguration:(WKWebViewConfiguration*)config
   return nil;
 }
 
+// --- Dialog handlers (alert / confirm / prompt). beforeunload is not
+//     surfaced by WKUIDelegate on macOS — the cancel/proceed decision is made
+//     through the navigation-policy delegate's `decidePolicyForNavigationAction:`
+//     which we already drive via the `will-navigate` allow-list. Hence no
+//     beforeunload arm on this backend.
+
+- (void)webView:(WKWebView*)wv
+  runJavaScriptAlertPanelWithMessage:(NSString*)message
+                    initiatedByFrame:(WKFrameInfo*)frame
+                   completionHandler:(void (^)(void))completionHandler
+{
+  (void)frame;
+  uint32_t view_id = bunite_mac::viewIdForWebView(wv);
+  auto* v = bunite_mac::findView(view_id);
+  if (!v) { completionHandler(); return; }
+  uint32_t rid = v->next_dialog_request_id++;
+  v->pending_dialogs[rid] = ^(bool /*accept*/, const std::string& /*text*/) {
+    completionHandler();
+  };
+  std::string payload = "{\"requestId\":" + std::to_string(rid) +
+    ",\"kind\":\"alert\",\"message\":\"" +
+    bunite_mac::escapeJsonString(message.UTF8String ?: "") + "\"}";
+  // Post emit to next runloop turn so a heavy host-side listener cannot stall
+  // the cooperative pump while the page is awaiting the completion handler.
+  dispatch_async(dispatch_get_main_queue(), ^{
+    bunite_mac::emitWebviewEvent(view_id, "dialog", payload);
+  });
+}
+
+- (void)webView:(WKWebView*)wv
+  runJavaScriptConfirmPanelWithMessage:(NSString*)message
+                      initiatedByFrame:(WKFrameInfo*)frame
+                     completionHandler:(void (^)(BOOL))completionHandler
+{
+  (void)frame;
+  uint32_t view_id = bunite_mac::viewIdForWebView(wv);
+  auto* v = bunite_mac::findView(view_id);
+  if (!v) { completionHandler(NO); return; }
+  uint32_t rid = v->next_dialog_request_id++;
+  v->pending_dialogs[rid] = ^(bool accept, const std::string& /*text*/) {
+    completionHandler(accept ? YES : NO);
+  };
+  std::string payload = "{\"requestId\":" + std::to_string(rid) +
+    ",\"kind\":\"confirm\",\"message\":\"" +
+    bunite_mac::escapeJsonString(message.UTF8String ?: "") + "\"}";
+  dispatch_async(dispatch_get_main_queue(), ^{
+    bunite_mac::emitWebviewEvent(view_id, "dialog", payload);
+  });
+}
+
+- (void)webView:(WKWebView*)wv
+  runJavaScriptTextInputPanelWithPrompt:(NSString*)prompt
+                            defaultText:(NSString*)defaultText
+                       initiatedByFrame:(WKFrameInfo*)frame
+                      completionHandler:(void (^)(NSString*))completionHandler
+{
+  (void)frame;
+  uint32_t view_id = bunite_mac::viewIdForWebView(wv);
+  auto* v = bunite_mac::findView(view_id);
+  if (!v) { completionHandler(nil); return; }
+  uint32_t rid = v->next_dialog_request_id++;
+  v->pending_dialogs[rid] = ^(bool accept, const std::string& text) {
+    completionHandler(accept ? [NSString stringWithUTF8String:text.c_str()] : nil);
+  };
+  std::string payload = "{\"requestId\":" + std::to_string(rid) +
+    ",\"kind\":\"prompt\",\"message\":\"" +
+    bunite_mac::escapeJsonString(prompt.UTF8String ?: "") +
+    "\",\"defaultPrompt\":\"" +
+    bunite_mac::escapeJsonString(defaultText.UTF8String ?: "") + "\"}";
+  dispatch_async(dispatch_get_main_queue(), ^{
+    bunite_mac::emitWebviewEvent(view_id, "dialog", payload);
+  });
+}
+
 - (void)webView:(WKWebView*)wv
 requestMediaCapturePermissionForOrigin:(WKSecurityOrigin*)origin
               initiatedByFrame:(WKFrameInfo*)frame
@@ -196,6 +333,7 @@ bool createView(uint32_t view_id, uint32_t window_id,
   static __strong BuniteUIDelegate* uiDelegate = [[BuniteUIDelegate alloc] init];
   wv.navigationDelegate = navDelegate;
   wv.UIDelegate = uiDelegate;
+  [wv addObserver:[BuniteTitleObserver shared] forKeyPath:@"title" options:NSKeyValueObservingOptionNew context:NULL];
 
   [container addSubview:wv];
   [window_state->window.contentView addSubview:container];
@@ -272,7 +410,11 @@ void removeView(uint32_t view_id) {
     for (BunitePendingPermission* p in to_deny) p.handler(WKPermissionDecisionDeny);
   }
 
-  if (wv) [webviewIdTable() removeObjectForKey:wv];
+  if (wv) {
+    @try { [wv removeObserver:[BuniteTitleObserver shared] forKeyPath:@"title"]; }
+    @catch (NSException*) { /* never registered (race) */ }
+    [webviewIdTable() removeObjectForKey:wv];
+  }
   if (container) [container removeFromSuperview];
 }