fix(macos): keep A2UI canvas content visible (#75039)

ngutman · web-flow · commit 58a0b077c1c5 · 2026-04-30T14:21:06.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -68,6 +68,7 @@ Docs: https://docs.openclaw.ai
 - Feishu: skip empty-text messages (e.g. `{"text":""}`) that carry no media, so no blank user turn is written to the session and downstream LLM providers cannot reject the request with "messages must not be empty". (#74634) Thanks @xdengli and @hclsys.
 - Feishu/Bitable: clean up newly created placeholder rows whose fields contain only default empty values while preserving meaningful link, attachment, user, number, boolean, and location values during create-app cleanup. (#73920) Carries forward #40602. Thanks @boat2moon.
 - macOS app: keep attach-only mode and the Debug Settings launchd toggle marker-only, so launching with `--attach-only`/`--no-launchd` no longer uninstalls the Gateway LaunchAgent or drops active sessions. (#72174) Thanks @DolencLuka.
+- macOS Canvas: stop auto-reloading the current A2UI host during push/eval/snapshot flows, so pushed A2UI content remains visible instead of returning to the empty Canvas shell. Fixes #73337. Thanks @Gr4via.
 - Plugin SDK: restore the deprecated `plugin-sdk/zalouser` command-auth facade so published Lark/Zalo plugins that import it load on current hosts. Fixes #74702. Thanks @Goron01.
 - Plugins/runtime-deps: include bundled provider plugins when `models.providers`, auth profiles, agent defaults, or subagent model refs configure that provider, while keeping inactive default-enabled provider plugins out of doctor repair. Refs #74307. Thanks @Skeptomenos.
 - Plugins/runtime: resolve relative plugin `api.resolvePath` inputs against the plugin root instead of the host working directory, while keeping absolute and home paths user-resolved. Fixes #74718. Thanks @jimdawdy-hub.
diff --git a/apps/macos/Sources/OpenClaw/CanvasManager.swift b/apps/macos/Sources/OpenClaw/CanvasManager.swift
@@ -184,7 +184,9 @@ final class CanvasManager {
 
     private func maybeAutoNavigateToA2UI(controller: CanvasWindowController, a2uiUrl: String?) {
         guard let a2uiUrl else { return }
-        let shouldNavigate = controller.shouldAutoNavigateToA2UI(lastAutoTarget: self.lastAutoA2UIUrl)
+        let shouldNavigate = controller.shouldAutoNavigateToA2UI(
+            lastAutoTarget: self.lastAutoA2UIUrl,
+            candidateTarget: a2uiUrl)
         guard shouldNavigate else {
             Self.logger.debug("canvas auto-nav skipped; target unchanged")
             return
diff --git a/apps/macos/Sources/OpenClaw/CanvasWindowController.swift b/apps/macos/Sources/OpenClaw/CanvasWindowController.swift
@@ -319,12 +319,14 @@ final class CanvasWindowController: NSWindowController, WKNavigationDelegate, NS
         self.sessionDir.path
     }
 
-    func shouldAutoNavigateToA2UI(lastAutoTarget: String?) -> Bool {
-        let trimmed = (self.currentTarget ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
-        if trimmed.isEmpty || trimmed == "/" { return true }
+    func shouldAutoNavigateToA2UI(lastAutoTarget: String?, candidateTarget: String) -> Bool {
+        let current = (self.currentTarget ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+        let candidate = candidateTarget.trimmingCharacters(in: .whitespacesAndNewlines)
+        if current.isEmpty || current == "/" { return true }
+        if !candidate.isEmpty, current == candidate { return false }
         if let lastAuto = lastAutoTarget?.trimmingCharacters(in: .whitespacesAndNewlines),
            !lastAuto.isEmpty,
-           trimmed == lastAuto
+           current == lastAuto
         {
             return true
         }
diff --git a/apps/macos/Tests/OpenClawIPCTests/CanvasWindowSmokeTests.swift b/apps/macos/Tests/OpenClawIPCTests/CanvasWindowSmokeTests.swift
@@ -46,4 +46,37 @@ struct CanvasWindowSmokeTests {
         controller.hideCanvas()
         controller.close()
     }
+
+    @Test func `A2UI auto navigation is idempotent for current host target`() throws {
+        let root = FileManager().temporaryDirectory
+            .appendingPathComponent("openclaw-canvas-test-\(UUID().uuidString)")
+        try FileManager().createDirectory(at: root, withIntermediateDirectories: true)
+        defer { try? FileManager().removeItem(at: root) }
+
+        let controller = try CanvasWindowController(
+            sessionKey: "main",
+            root: root,
+            presentation: .window)
+        defer { controller.close() }
+
+        let oldTarget = "http://127.0.0.1:18789/__openclaw__/a2ui/?platform=macos"
+        let currentTarget = "http://127.0.0.1:18790/__openclaw__/a2ui/?platform=macos"
+        let userTarget = "https://github.com/openclaw/openclaw"
+
+        #expect(controller.shouldAutoNavigateToA2UI(lastAutoTarget: nil, candidateTarget: currentTarget) == true)
+
+        controller.load(target: "/")
+        #expect(controller.shouldAutoNavigateToA2UI(lastAutoTarget: nil, candidateTarget: currentTarget) == true)
+
+        controller.load(target: currentTarget)
+        #expect(controller
+            .shouldAutoNavigateToA2UI(lastAutoTarget: currentTarget, candidateTarget: currentTarget) == false)
+
+        controller.load(target: oldTarget)
+        #expect(controller.shouldAutoNavigateToA2UI(lastAutoTarget: oldTarget, candidateTarget: currentTarget) == true)
+
+        controller.load(target: userTarget)
+        #expect(controller
+            .shouldAutoNavigateToA2UI(lastAutoTarget: currentTarget, candidateTarget: currentTarget) == false)
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -319,12 +319,14 @@ final class CanvasWindowController: NSWindowController, WKNavigationDelegate, NS`
`319`	`319`	`self.sessionDir.path`
`320`	`320`	`}`
`321`	`321`
`322`		`- func shouldAutoNavigateToA2UI(lastAutoTarget: String?) -> Bool {`
`323`		`- let trimmed = (self.currentTarget ?? "").trimmingCharacters(in: .whitespacesAndNewlines)`
`324`		`- if trimmed.isEmpty \|\| trimmed == "/" { return true }`
	`322`	`+ func shouldAutoNavigateToA2UI(lastAutoTarget: String?, candidateTarget: String) -> Bool {`
	`323`	`+ let current = (self.currentTarget ?? "").trimmingCharacters(in: .whitespacesAndNewlines)`
	`324`	`+ let candidate = candidateTarget.trimmingCharacters(in: .whitespacesAndNewlines)`
	`325`	`+ if current.isEmpty \|\| current == "/" { return true }`
	`326`	`+ if !candidate.isEmpty, current == candidate { return false }`
`325`	`327`	`if let lastAuto = lastAutoTarget?.trimmingCharacters(in: .whitespacesAndNewlines),`
`326`	`328`	`!lastAuto.isEmpty,`
`327`		`- trimmed == lastAuto`
	`329`	`+ current == lastAuto`
`328`	`330`	`{`
`329`	`331`	`return true`
`330`	`332`	`}`