Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

fix(cua-driver): Swift 6 Sendable fixes + restore enableJavaScriptAppleEvents

Francesco Bonacci6f3db6dbbdb4
diff --git a/libs/cua-driver/Sources/CuaDriverCore/Browser/BrowserJS.swift b/libs/cua-driver/Sources/CuaDriverCore/Browser/BrowserJS.swift
index 6daff59ebb..48f089aa51 100644
--- a/libs/cua-driver/Sources/CuaDriverCore/Browser/BrowserJS.swift
+++ b/libs/cua-driver/Sources/CuaDriverCore/Browser/BrowserJS.swift
@@ -20,6 +20,7 @@ public enum BrowserJS {
case windowNotFound(UInt32)
case javascriptNotEnabled(String)
case executionFailed(String)
+ case enableFailed(String)
public var description: String {
switch self {
@@ -37,10 +38,78 @@ public enum BrowserJS {
+ "for the programmatic setup path (quit browser → edit Preferences JSON → relaunch)."
case .executionFailed(let detail):
return "JavaScript execution failed: \(detail)"
+ case .enableFailed(let detail):
+ return "Failed to enable 'Allow JavaScript from Apple Events': \(detail)"
}
}
}
+ // MARK: - Enable Apple Events JS
+
+ /// Quit `bundleId`, patch every profile's Preferences JSON to set
+ /// `browser.allow_javascript_apple_events = true`, then relaunch.
+ public static func enableJavaScriptAppleEvents(bundleId: String) async throws {
+ guard let appName = browserSpec(for: bundleId)?.appName else {
+ throw Error.unsupportedBrowser(bundleId)
+ }
+
+ // Quit the browser and wait for it to exit (Chrome writes Preferences on quit).
+ let quitScript = "tell application \"\(appName)\" to quit"
+ _ = try? await runAppleScript(quitScript, appName: appName)
+ try await Task.sleep(for: .seconds(1))
+
+ guard let profDir = profilesDirectory(for: bundleId) else {
+ throw Error.enableFailed("No profiles directory found for \(bundleId)")
+ }
+ let fm = FileManager.default
+ let prefsFiles = (try? fm.contentsOfDirectory(atPath: profDir))?.compactMap { entry -> String? in
+ let candidate = (profDir as NSString).appendingPathComponent(entry + "/Preferences")
+ return fm.fileExists(atPath: candidate) ? candidate : nil
+ } ?? []
+
+ if prefsFiles.isEmpty {
+ throw Error.enableFailed("No Preferences files found under \(profDir)")
+ }
+
+ for path in prefsFiles {
+ guard let data = fm.contents(atPath: path),
+ var json = try? JSONSerialization.jsonObject(with: data) as? [String: Any]
+ else { continue }
+ var browser = json["browser"] as? [String: Any] ?? [:]
+ browser["allow_javascript_apple_events"] = true
+ json["browser"] = browser
+ // Chrome syncs this setting; patch account_values too so it survives a sync cycle.
+ var accountValues = json["account_values"] as? [String: Any] ?? [:]
+ var avBrowser = accountValues["browser"] as? [String: Any] ?? [:]
+ avBrowser["allow_javascript_apple_events"] = true
+ accountValues["browser"] = avBrowser
+ json["account_values"] = accountValues
+ guard let patched = try? JSONSerialization.data(withJSONObject: json) else { continue }
+ try patched.write(to: URL(fileURLWithPath: path))
+ }
+
+ // Relaunch.
+ let proc = Process()
+ proc.executableURL = URL(fileURLWithPath: "/usr/bin/open")
+ proc.arguments = ["-a", appName]
+ try proc.run()
+ proc.waitUntilExit()
+ }
+
+ private static func profilesDirectory(for bundleId: String) -> String? {
+ let home = FileManager.default.homeDirectoryForCurrentUser.path
+ switch bundleId {
+ case "com.google.Chrome":
+ return "\(home)/Library/Application Support/Google/Chrome"
+ case "com.brave.Browser":
+ return "\(home)/Library/Application Support/BraveSoftware/Brave-Browser"
+ case "com.microsoft.edgemac":
+ return "\(home)/Library/Application Support/Microsoft Edge"
+ default:
+ return nil
+ }
+ }
+
/// Run `javascript` in the active tab of the browser window identified by
/// `windowId` (CGWindowID) and return the result as a string.
public static func execute(
@@ -173,15 +242,19 @@ public enum BrowserJS {
}
}
- let timeoutItem = DispatchWorkItem {
+ // Cancellation flag: set by terminationHandler to stop the timeout
+ // from firing after natural completion. OSAllocatedUnfairLock is
+ // Sendable, so it can safely cross concurrency boundaries.
+ let timedOut = OSAllocatedUnfairLock(initialState: false)
+ DispatchQueue.global().asyncAfter(deadline: .now() + 15) {
+ guard !timedOut.withLock({ $0 }) else { return }
proc.terminate()
resumeOnce(.failure(Error.executionFailed(
"osascript timed out after 15 s — browser may be showing a permission dialog")))
}
- DispatchQueue.global().asyncAfter(deadline: .now() + 15, execute: timeoutItem)
proc.terminationHandler = { p in
- timeoutItem.cancel()
+ timedOut.withLock { $0 = true }
let out = String(
data: stdout.fileHandleForReading.readDataToEndOfFile(),
encoding: .utf8
@@ -201,7 +274,7 @@ public enum BrowserJS {
do {
try proc.run()
} catch {
- timeoutItem.cancel()
+ timedOut.withLock { $0 = true }
resumeOnce(.failure(error))
}
}
diff --git a/libs/cua-driver/Sources/CuaDriverCore/Browser/CDPClient.swift b/libs/cua-driver/Sources/CuaDriverCore/Browser/CDPClient.swift
index 1ee1ef6834..9e24e862e9 100644
--- a/libs/cua-driver/Sources/CuaDriverCore/Browser/CDPClient.swift
+++ b/libs/cua-driver/Sources/CuaDriverCore/Browser/CDPClient.swift
@@ -1,4 +1,5 @@
import Foundation
+import os
/// Shared Chrome DevTools Protocol (CDP) HTTP + WebSocket evaluator.
///
@@ -93,13 +94,13 @@ public enum CDPClient {
// Single-resume guard: ensures the continuation is resumed exactly once
// even if the timeout fires concurrently with a late-arriving frame.
- let lock = NSLock()
- var resumed = false
- func resumeOnce(_ action: () -> Void) {
- lock.lock()
- defer { lock.unlock() }
- guard !resumed else { return }
- resumed = true
+ let once = OSAllocatedUnfairLock(initialState: false)
+ let resumeOnce: @Sendable (() -> Void) -> Void = { action in
+ let shouldRun = once.withLock { (fired: inout Bool) -> Bool in
+ guard !fired else { return false }
+ fired = true; return true
+ }
+ guard shouldRun else { return }
action()
}
diff --git a/libs/cua-driver/Sources/CuaDriverServer/Tools/ClickTool.swift b/libs/cua-driver/Sources/CuaDriverServer/Tools/ClickTool.swift
index e0a9f55f06..777e9d3fef 100644
--- a/libs/cua-driver/Sources/CuaDriverServer/Tools/ClickTool.swift
+++ b/libs/cua-driver/Sources/CuaDriverServer/Tools/ClickTool.swift
@@ -1,3 +1,4 @@
+import AppKit
import ApplicationServices
import CoreGraphics
import CuaDriverCore