fix(macos): open dashboard when Dock or Finder relaunches app (#97637)

Solvely-Colin · web-flow · commit 59d8462b1d25 · 2026-06-28T20:24:15.000-07:00
* fix(macos): open dashboard on Dock reopen

* fix(macos): preserve visible-window Dock reopen

* style(macos): satisfy deep link switch formatting
diff --git a/apps/macos/Sources/OpenClaw/DeepLinks.swift b/apps/macos/Sources/OpenClaw/DeepLinks.swift
@@ -59,18 +59,21 @@ final class DeepLinkHandler {
             deepLinkLogger.debug("ignored url \(url.absoluteString, privacy: .public)")
             return
         }
-        guard !AppStateStore.shared.isPaused else {
-            self.presentAlert(title: "OpenClaw is paused", message: "Unpause OpenClaw to run agent actions.")
-            return
-        }
-
         switch route {
+        case .dashboard:
+            await self.openDashboard()
+            return
         case let .agent(link):
+            guard !AppStateStore.shared.isPaused else {
+                self.presentAlert(title: "OpenClaw is paused", message: "Unpause OpenClaw to run agent actions.")
+                return
+            }
             await self.handleAgent(link: link, originalURL: url)
         case .gateway:
-            break
-        case .dashboard:
-            await self.openDashboard()
+            guard !AppStateStore.shared.isPaused else {
+                self.presentAlert(title: "OpenClaw is paused", message: "Unpause OpenClaw to run agent actions.")
+                return
+            }
         }
     }
 
diff --git a/apps/macos/Sources/OpenClaw/MenuBar.swift b/apps/macos/Sources/OpenClaw/MenuBar.swift
@@ -274,8 +274,10 @@ private struct SettingsWindowOpenRegistrar: View {
 
 @MainActor
 final class AppDelegate: NSObject, NSApplicationDelegate {
+    private static let dashboardURL = URL(string: "openclaw://dashboard")!
     private var state: AppState?
     private let webChatAutoLogger = Logger(subsystem: "ai.openclaw", category: "Chat")
+    var openDashboardAction: @MainActor () -> Void = { AppNavigationActions.openDashboard() }
     let updaterController: UpdaterProviding = makeUpdaterController()
 
     func applicationDockMenu(_: NSApplication) -> NSMenu? {
@@ -313,7 +315,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
     @objc
     private func openDashboardFromDockMenu(_: Any?) {
-        AppNavigationActions.openDashboard()
+        self.openDashboardAction()
     }
 
     @objc
@@ -339,9 +341,18 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         }
     }
 
+    func applicationShouldHandleReopen(_: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
+        if flag {
+            return true
+        }
+        self.openDashboardAction()
+        return false
+    }
+
     @MainActor
     func applicationDidFinishLaunching(_ notification: Notification) {
         if self.isDuplicateInstance() {
+            NSWorkspace.shared.open(Self.dashboardURL)
             NSApp.terminate(nil)
             return
         }
diff --git a/apps/macos/Tests/OpenClawIPCTests/MenuContentSmokeTests.swift b/apps/macos/Tests/OpenClawIPCTests/MenuContentSmokeTests.swift
@@ -50,4 +50,34 @@ struct MenuContentSmokeTests {
         #expect(titles.contains("Open Canvas") || titles.contains("Close Canvas"))
         #expect(titles.contains("Settings…"))
     }
+
+    @Test func `dock reopen opens dashboard and suppresses default handling`() {
+        let delegate = AppDelegate()
+        var didOpenDashboard = false
+        delegate.openDashboardAction = {
+            didOpenDashboard = true
+        }
+
+        let shouldUseDefaultHandling = delegate.applicationShouldHandleReopen(
+            NSApplication.shared,
+            hasVisibleWindows: false)
+
+        #expect(shouldUseDefaultHandling == false)
+        #expect(didOpenDashboard)
+    }
+
+    @Test func `dock reopen keeps default handling when windows are visible`() {
+        let delegate = AppDelegate()
+        var didOpenDashboard = false
+        delegate.openDashboardAction = {
+            didOpenDashboard = true
+        }
+
+        let shouldUseDefaultHandling = delegate.applicationShouldHandleReopen(
+            NSApplication.shared,
+            hasVisibleWindows: true)
+
+        #expect(shouldUseDefaultHandling)
+        #expect(!didOpenDashboard)
+    }
 }
