fix(macos): improve canvas A2UI forwarding

apps/macos/Sources/Clawdis/CanvasWindow.swift

@@ -105,7 +105,14 @@ final class CanvasWindowController: NSWindowController, WKNavigationDelegate, NS
                 };
 
                 const handler = globalThis.webkit?.messageHandlers?.clawdisCanvasA2UIAction;
-                if (handler?.postMessage) {
+
+                // If the bundled A2UI shell is present, let it forward actions so we keep its richer
+                // context resolution (data model path lookups, surface detection, etc.).
+                const hasBundledA2UIHost = !!globalThis.clawdisA2UI || !!document.querySelector('clawdis-a2ui-host');
+                if (hasBundledA2UIHost && handler?.postMessage) return;
+
+                // Otherwise, forward directly when possible.
+                if (!hasBundledA2UIHost && handler?.postMessage) {
                   handler.postMessage({ userAction });
                   return;
                 }
@@ -210,10 +217,8 @@ final class CanvasWindowController: NSWindowController, WKNavigationDelegate, NS
     func hideCanvas() {
         if case .panel = self.presentation {
             self.persistFrameIfPanel()
-            self.window?.orderOut(nil)
-        } else {
-            self.close()
         }
+        self.window?.orderOut(nil)
         self.onVisibilityChanged?(false)
     }
 
@@ -327,16 +332,17 @@ final class CanvasWindowController: NSWindowController, WKNavigationDelegate, NS
     private static func makeWindow(for presentation: CanvasPresentation, contentView: NSView) -> NSWindow {
         switch presentation {
         case .window:
-            let window = NSWindow(
-                contentRect: NSRect(origin: .zero, size: CanvasLayout.windowSize),
-                styleMask: [.titled, .closable, .resizable, .miniaturizable],
-                backing: .buffered,
-                defer: false)
-            window.title = "Clawdis Canvas"
-            window.contentView = contentView
-            window.center()
-            window.minSize = NSSize(width: 880, height: 680)
-            return window
+	            let window = NSWindow(
+	                contentRect: NSRect(origin: .zero, size: CanvasLayout.windowSize),
+	                styleMask: [.titled, .closable, .resizable, .miniaturizable],
+	                backing: .buffered,
+	                defer: false)
+	            window.title = "Clawdis Canvas"
+	            window.isReleasedWhenClosed = false
+	            window.contentView = contentView
+	            window.center()
+	            window.minSize = NSSize(width: 880, height: 680)
+	            return window
 
         case .panel:
             let panel = CanvasPanel(

docs/refactor/canvas-a2ui.md

@@ -17,11 +17,13 @@
   - Inject an A2UI → native bridge at document start that listens for `a2uiaction` and forwards it:
     - Prefer `WKScriptMessageHandler` when available.
     - Otherwise fall back to an unattended `clawdis://agent?...&key=...` deep link (no prompt).
+  - Avoid double-sending actions when the bundled A2UI shell is present (let the shell forward clicks so it can resolve richer context).
   - Intercept `clawdis://…` navigations inside the Canvas WKWebView and route them through `DeepLinkHandler` (no NSWorkspace bounce).
   - `GatewayConnection` auto-starts the local gateway (and retries briefly) when a request fails in `.local` mode, so Canvas actions don’t silently fail if the gateway isn’t running yet.
   - Fix a crash that made `clawdis-mac canvas show`/`eval` look “hung”:
     - `VoicePushToTalkHotkey`’s NSEvent monitor could call `@MainActor` code off-main, triggering executor checks / EXC_BAD_ACCESS on macOS 26.2.
     - Now it hops back to the main actor before mutating state.
+  - Preserve in-page state when closing Canvas (hide the window instead of closing the `WKWebView`).
 
 ## Follow-ups
 - Add a small “action sent / failed” debug overlay in the A2UI shell (dev-only) to make failures obvious.