Wrong app is focused when clicking icon from Dock if the current focus is on a different monitor

[yuliswe]

Body

Steps to reproduce:

1. Have duo monitors, on the main monitor workspace, open 2 apps in accordion mode (place app A on top of App B); on the second monitor, open an app
2. Click to gain focus on the second monitor's app
3. Then, click on app B's icon from the the Dock

Expected result: App B in the main monitor gains focus
Actual result: App B flickers a second, then app A gains focus

Additional info

Video has sound:

IMG_0448.compressed_100MB.mp4

$ aerospace -v
aerospace CLI client version: 0.19.0-Beta 1bc5df2846a54932849af5b5ce15597129e07fa0
AeroSpace.app server version: 0.19.0-Beta 1bc5df2846a54932849af5b5ce15597129e07fa0

In code you can see

targetMonitor.activeWorkspace.focusWorkspace()

extension Workspace {
    @MainActor func focusWorkspace() -> Bool { setFocus(to: toLiveFocus()) }

    func toLiveFocus() -> LiveFocus {
        // todo unfortunately mostRecentWindowRecursive may recursively reach empty rootTilingContainer
        //      while floating or macos unconventional windows might be presented
        if let wd = mostRecentWindowRecursive ?? anyLeafWindowRecursive {
            LiveFocus(windowOrNil: wd, workspace: self)
        } else {
            LiveFocus(windowOrNil: nil, workspace: self) // emptyWorkspace
        }
    }
}

It seems to me this is the logic: when you click on a different monitor, the clicked monitor's workspace gains focus, then the code will make the most recent window gain focus, which happens to be app A instead.

Is it possible to fix this issue? I think maybe it needs to differentiate workspace focus by mouse clicking vs. keyboard shortcut. If it's mouse click, then I don't think it needs to focus on the most recent window.

Alternatively, maybe another solution is, instead of first calling focus workspace then focus window, can we detect the currently focused window, then make the window's workspace focused?

Do you know the correct solution for this? I can make a PR.

[yuliswe]

I created a PR #1597