Merge branch 'feat/durable-auth-profiles-155' into feat/credential-vault-156

Author: SarthakWade

apps/headless/Host/AgentBridge.swift

@@ -13,9 +13,24 @@ struct ScreenshotArtifactData {
 
 extension BrowserWindowController {
     func agentVisit(_ url: URL, timeout: TimeInterval = 20) throws -> JSONValue {
-        onMain { self.navigate(to: url) }
-        Thread.sleep(forTimeInterval: 0.05)
-        return try agentWait(parameters: ["settled": .bool(true), "timeoutMs": .number(timeout * 1_000)])
+        let deadline = Date().addingTimeInterval(timeout)
+        guard onMain({ self.beginAgentNavigation(to: url) }) else {
+            throw HostError(code: .operationFailed, message: "Browser refused to start navigation")
+        }
+        while Date() < deadline {
+            let status = onMain { self.agentNavigationStatus() }
+            if status.failed {
+                throw HostError(code: .operationFailed, message: "Browser navigation failed")
+            }
+            if !status.pending {
+                let remainingMs = max(100, deadline.timeIntervalSinceNow * 1_000)
+                return try agentWait(parameters: [
+                    "settled": .bool(true), "timeoutMs": .number(remainingMs),
+                ])
+            }
+            Thread.sleep(forTimeInterval: 0.05)
+        }
+        throw HostError(code: .timedOut, message: "Timed out while waiting for navigation")
     }
 
     func agentInspect(parameters: [String: JSONValue]) throws -> JSONValue {

apps/headless/Tests/macos-e2e.sh

@@ -419,6 +419,14 @@ if [[ "$(frontmost_pid)" == "$BACKGROUND_PID" ]]; then
   fail
 fi
 "$CLI" stop >/dev/null
+for _ in {1..100}; do
+  ! kill -0 "$BACKGROUND_PID" >/dev/null 2>&1 && break
+  sleep 0.05
+done
+if kill -0 "$BACKGROUND_PID" >/dev/null 2>&1; then
+  echo "background override host did not stop" >&2
+  fail
+fi
 
 STEP="durable-authentication-profile"
 "$CLI" start --background | grep -q '"ready":true'

apps/headless/main.swift

@@ -242,6 +242,8 @@ final class BrowserWindowController: NSWindowController, NSWindowDelegate,
     private var lastProgress: CGFloat = 0
     private var onStartPage = false
     private var pendingRestoredStartupURL: URL?
+    private var pendingAgentNavigation: WKNavigation?
+    private var pendingAgentNavigationFailed = false
     private var agentControlEnabled = false
     var onClose: (() -> Void)?
 
@@ -478,6 +480,18 @@ final class BrowserWindowController: NSWindowController, NSWindowDelegate,
         load(url)
     }
 
+    func beginAgentNavigation(to url: URL) -> Bool {
+        pendingRestoredStartupURL = nil
+        onStartPage = false
+        pendingAgentNavigationFailed = false
+        pendingAgentNavigation = webView.load(URLRequest(url: url))
+        return pendingAgentNavigation != nil
+    }
+
+    func agentNavigationStatus() -> (pending: Bool, failed: Bool) {
+        (pendingAgentNavigation != nil, pendingAgentNavigationFailed)
+    }
+
     private func load(_ url: URL) {
         onStartPage = false
         if url.isFileURL {
@@ -694,6 +708,7 @@ final class BrowserWindowController: NSWindowController, NSWindowDelegate,
     }
 
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        completeAgentNavigation(navigation, failed: false)
         if let job = snapJob {
             snapJob = nil
             runSnapJob(job)
@@ -706,13 +721,21 @@ final class BrowserWindowController: NSWindowController, NSWindowDelegate,
     }
 
     func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
+        completeAgentNavigation(navigation, failed: true)
         handleLoadError(error)
     }
 
     func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
+        completeAgentNavigation(navigation, failed: true)
         handleLoadError(error)
     }
 
+    private func completeAgentNavigation(_ navigation: WKNavigation?, failed: Bool) {
+        guard let navigation, pendingAgentNavigation === navigation else { return }
+        pendingAgentNavigation = nil
+        pendingAgentNavigationFailed = failed
+    }
+
     private func handleLoadError(_ error: Error) {
         let e = error as NSError
         // Ignore cancelled loads and "frame load interrupted" (downloads, redirects).