From 6f3ed4f3b8eb45734ca77916b4c96fab937cb2e2 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Sun, 31 May 2026 02:58:27 +0800
Subject: [PATCH] Prepare 7.8.7 dock policy release

---
 Scripts/window_logic_qa.sh |  224 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 212 insertions(+), 12 deletions(-)

diff --git a/Scripts/window_logic_qa.sh b/Scripts/window_logic_qa.sh
index f93b3f2..4a333b0 100755
--- a/Scripts/window_logic_qa.sh
+++ b/Scripts/window_logic_qa.sh
@@ -278,6 +278,61 @@
   log "PASS Dock tile count: $names"
 }
 
+assert_no_dock_tile() {
+  local output count names
+  output="$(osascript <<'OSA'
+tell application "System Events"
+  tell process "Dock"
+    set tagCount to 0
+    set tagNames to {}
+    repeat with itemRef in UI elements of list 1
+      try
+        set itemName to name of itemRef as text
+        if itemName is "TagLauncher" then
+          set tagCount to tagCount + 1
+          set end of tagNames to itemName
+        end if
+      end try
+    end repeat
+    return (tagCount as text) & "|" & (tagNames as text)
+  end tell
+end tell
+OSA
+)"
+  count="${output%%|*}"
+  names="${output#*|}"
+  if [[ "$count" != "0" ]]; then
+    echo "FAIL: expected no TagLauncher Dock tile, got $count ($names)" >&2
+    return 1
+  fi
+  log "PASS no TagLauncher Dock tile"
+}
+
+click_taglauncher_dock_tile() {
+  local coords x y
+  coords="$(osascript <<'OSA'
+tell application "System Events"
+  tell process "Dock"
+    repeat with itemRef in UI elements of list 1
+      try
+        if (name of itemRef as text) is "TagLauncher" then
+          set itemPosition to position of itemRef
+          set itemSize to size of itemRef
+          set centerX to (item 1 of itemPosition) + ((item 1 of itemSize) / 2)
+          set centerY to (item 2 of itemPosition) + ((item 2 of itemSize) / 2)
+          return (centerX as integer as text) & " " & (centerY as integer as text)
+        end if
+      end try
+    end repeat
+    error "TagLauncher Dock tile not found"
+  end tell
+end tell
+OSA
+)"
+  read -r x y <<<"$coords"
+  click_xy "$x" "$y"
+}
+
 assert_frontmost_taglauncher() {
   local frontmost
   frontmost="$(osascript -e 'tell application "System Events" to get name of first application process whose frontmost is true')"
@@ -381,6 +436,39 @@
     }
 }
 
+func rect(_ window: WindowInfo) -> CGRect {
+    CGRect(
+        x: dimension(window.bounds, "X"),
+        y: dimension(window.bounds, "Y"),
+        width: dimension(window.bounds, "Width"),
+        height: dimension(window.bounds, "Height")
+    )
+}
+
+func isOverlayWindow(_ window: WindowInfo) -> Bool {
+    guard window.name.isEmpty else { return false }
+    let windowFrame = rect(window)
+    return NSScreen.screens.contains { screen in
+        let screenFrame = screen.frame
+        return abs(windowFrame.width - screenFrame.width) <= 12
+            && windowFrame.height >= screenFrame.height * 0.75
+            && abs(windowFrame.midX - screenFrame.midX) <= 12
+    }
+}
+
+func isQuickSearchWindow(_ window: WindowInfo) -> Bool {
+    guard window.name.isEmpty, !isOverlayWindow(window) else { return false }
+    let windowFrame = rect(window)
+    return windowFrame.width >= 500
+        && windowFrame.width <= 900
+        && windowFrame.height >= 120
+        && windowFrame.height <= 850
+}
+
+func isSettingsLikeWindow(_ window: WindowInfo) -> Bool {
+    !window.name.isEmpty
+}
+
 func assertTagLayer(_ tag: [WindowInfo]) {
     for window in tag where window.layer != 23 {
         fail("TagLauncher window has unexpected layer \(window.layer); expected 23")
@@ -395,16 +483,32 @@
 case "overlay":
     guard tag.count == 1 else { fail("overlay expected 1 TagLauncher window, got \(tag.count)") }
     assertTagLayer(tag)
+    guard isOverlayWindow(tag[0]) else { fail("overlay window was not full-screen sized: \(tag[0].bounds)") }
     let menubarLayer = windows.first { $0.owner == "Window Server" && $0.name == "Menubar" }?.layer
     guard menubarLayer == 24 else { fail("menubar layer expected 24, got \(String(describing: menubarLayer))") }
     let dockWindows = windows.filter { $0.owner == "Dock" }
     guard dockWindows.isEmpty else { fail("Dock should be hidden while overlay is visible; found \(dockWindows.count) Dock windows") }
     print("PASS overlay: tagLayer=\(tag[0].layer) menubarLayer=24 dockWindows=0")
 
+case "quick-search":
+    guard tag.count == 2 else { fail("quick search expected overlay plus panel, got \(tag.count)") }
+    assertTagLayer(tag)
+    let overlays = tag.filter(isOverlayWindow)
+    let quickSearch = tag.filter(isQuickSearchWindow)
+    guard overlays.count == 1, quickSearch.count == 1 else {
+        fail("quick search stack wrong: names=\(tag.map(\.name)) bounds=\(tag.map(\.bounds))")
+    }
+    print("PASS quick search stack: tagLayers=\(tag.map(\.layer))")
+
 case "settings":
     guard tag.count == 2 else { fail("settings expected 2 TagLauncher windows, got \(tag.count)") }
     assertTagLayer(tag)
-    guard !tag[0].name.isEmpty, tag[1].name.isEmpty else {
+    let overlays = tag.filter(isOverlayWindow)
+    let settings = tag.filter(isSettingsLikeWindow)
+    guard overlays.count == 1, settings.count == 1 else {
+        fail("settings stack wrong: names=\(tag.map(\.name)) bounds=\(tag.map(\.bounds))")
+    }
+    guard !tag[0].name.isEmpty else {
         fail("settings order wrong: \(tag.map(\.name))")
     }
     print("PASS settings over overlay: order=\(tag.map(\.name))")
@@ -451,26 +555,33 @@
     print("PASS fullscreen target: layer=\(target.layer) bounds=\(target.bounds)")
 
 case "fullscreen-overlay":
-    guard tag.count == 1 else { fail("fullscreen overlay expected 1 TagLauncher window, got \(tag.count)") }
+    guard tag.count == 1 || tag.count == 2 else { fail("fullscreen overlay expected 1 or 2 TagLauncher windows, got \(tag.count)") }
     assertTagLayer(tag)
     guard let target = windows.first(where: { $0.name == "TagLauncherFullscreenQATargetFullscreen" }) else {
         fail("fullscreen target disappeared; TagLauncher likely switched to another Space")
     }
-    let overlayWidth = dimension(tag[0].bounds, "Width")
-    let overlayHeight = dimension(tag[0].bounds, "Height")
-    let overlayMidX = dimension(tag[0].bounds, "X") + overlayWidth / 2
+    guard let overlay = tag.first(where: isOverlayWindow) else {
+        fail("fullscreen overlay TagLauncher window not found: \(tag.map(\.bounds))")
+    }
+    let quickSearch = tag.filter(isQuickSearchWindow)
+    guard quickSearch.count == tag.count - 1 else {
+        fail("fullscreen overlay stack has unexpected windows: \(tag.map(\.bounds))")
+    }
+    let overlayWidth = dimension(overlay.bounds, "Width")
+    let overlayHeight = dimension(overlay.bounds, "Height")
+    let overlayMidX = dimension(overlay.bounds, "X") + overlayWidth / 2
     let targetWidth = dimension(target.bounds, "Width")
     let targetHeight = dimension(target.bounds, "Height")
     let targetMidX = dimension(target.bounds, "X") + targetWidth / 2
     guard abs(overlayWidth - targetWidth) <= 12,
           overlayHeight >= targetHeight * 0.88,
           abs(overlayMidX - targetMidX) <= 12 else {
-        fail("fullscreen overlay is not on the target fullscreen display: overlay=\(tag[0].bounds) target=\(target.bounds)")
+        fail("fullscreen overlay is not on the target fullscreen display: overlay=\(overlay.bounds) target=\(target.bounds)")
     }
-    guard tag[0].layer > target.layer else {
-        fail("TagLauncher layer \(tag[0].layer) is not above fullscreen target layer \(target.layer)")
+    guard tag.allSatisfy({ $0.layer > target.layer }) else {
+        fail("TagLauncher stack is not above fullscreen target")
     }
-    print("PASS fullscreen overlay above target: overlayLayer=\(tag[0].layer) targetLayer=\(target.layer)")
+    print("PASS fullscreen overlay above target: tagLayers=\(tag.map(\.layer)) targetLayer=\(target.layer)")
 
 case "fullscreen-settings":
     guard tag.count == 2 else { fail("fullscreen settings expected 2 TagLauncher windows, got \(tag.count)") }
@@ -478,7 +589,12 @@
     guard let target = windows.first(where: { $0.name == "TagLauncherFullscreenQATargetFullscreen" }) else {
         fail("fullscreen target disappeared after opening settings; TagLauncher likely switched to another Space")
     }
-    guard !tag[0].name.isEmpty, tag[1].name.isEmpty else {
+    let overlays = tag.filter(isOverlayWindow)
+    let settings = tag.filter(isSettingsLikeWindow)
+    guard overlays.count == 1, settings.count == 1 else {
+        fail("fullscreen settings stack wrong: names=\(tag.map(\.name)) bounds=\(tag.map(\.bounds))")
+    }
+    guard !tag[0].name.isEmpty else {
         fail("fullscreen settings order wrong: \(tag.map(\.name))")
     }
     guard tag.allSatisfy({ $0.layer > target.layer }) else {
@@ -634,6 +750,23 @@
     let overlayX = dimension(overlayBounds, "X")
     let overlayY = dimension(overlayBounds, "Y")
     print("\(Int(round(overlayX + 120))) \(Int(round(overlayY + 160)))")
+case "overlay-center":
+    guard let overlay = tag.max(by: { lhs, rhs in
+        let lhsBounds = lhs[kCGWindowBounds as String] as? NSDictionary ?? [:]
+        let rhsBounds = rhs[kCGWindowBounds as String] as? NSDictionary ?? [:]
+        let lhsArea = dimension(lhsBounds, "Width") * dimension(lhsBounds, "Height")
+        let rhsArea = dimension(rhsBounds, "Width") * dimension(rhsBounds, "Height")
+        return lhsArea < rhsArea
+    }), let overlayBounds = overlay[kCGWindowBounds as String] as? NSDictionary else {
+        let screen = NSScreen.screens.first?.frame ?? CGRect(x: 0, y: 0, width: 1200, height: 800)
+        print("\(Int(round(screen.midX))) \(Int(round(screen.midY)))")
+        exit(0)
+    }
+    let overlayX = dimension(overlayBounds, "X")
+    let overlayY = dimension(overlayBounds, "Y")
+    let overlayWidth = dimension(overlayBounds, "Width")
+    let overlayHeight = dimension(overlayBounds, "Height")
+    print("\(Int(round(overlayX + overlayWidth / 2))) \(Int(round(overlayY + overlayHeight / 2)))")
 case "fullscreen-target-center":
     guard let target = raw.first(where: { ($0[kCGWindowName as String] as? String) == "TagLauncherFullscreenQATargetFullscreen" }),
           let bounds = target[kCGWindowBounds as String] as? NSDictionary else {
@@ -893,6 +1026,28 @@
   click_xy "$x" "$y"
 }
 
+page_scroll_appgrid() {
+  local coords
+  coords="$(swift "$coords_swift" overlay-center)"
+  read -r x y <<<"$coords"
+  move_xy "$x" "$y"
+  sleep 0.15
+  swift - <<'SWIFT'
+import CoreGraphics
+if let event = CGEvent(
+    scrollWheelEvent2Source: nil,
+    units: .pixel,
+    wheelCount: 1,
+    wheel1: -900,
+    wheel2: 0,
+    wheel3: 0
+) {
+    event.post(tap: .cghidEventTap)
+}
+SWIFT
+  sleep 0.25
+}
+
 kill_fullscreen_qa_target() {
   if [[ -n "${FULLSCREEN_QA_PID:-}" ]]; then
     kill "$FULLSCREEN_QA_PID" >/dev/null 2>&1 || true
@@ -954,6 +1109,15 @@
 sleep 1.5
 assert_single_qa_app_instance
 assert_single_dock_tile
+swift_assert no-overlay
+for _ in {1..3}; do
+  "$APP_BUNDLE/Contents/MacOS/TagLauncher" >/dev/null 2>&1 &
+  sleep 0.25
+done
+sleep 2.0
+assert_single_qa_app_instance
+assert_single_dock_tile
+swift_assert no-overlay
 for _ in {1..3}; do
   "$APP_BUNDLE/Contents/MacOS/TagLauncher" --hide >/dev/null 2>&1 &
   sleep 0.25
@@ -961,6 +1125,25 @@
 sleep 2.0
 assert_single_qa_app_instance
 assert_single_dock_tile
+swift_assert no-overlay
+log "==> QA Dock reopen: showDockIcon=true opens App Grid from explicit app reopen"
+click_taglauncher_dock_tile
+sleep 1.0
+wait_swift_assert overlay
+send_keycode 53
+sleep 0.4
+wait_swift_assert no-overlay
+log "==> QA hidden Dock: main hotkey opens App Grid without showing Dock tile"
+defaults write "$DEFAULTS_DOMAIN" showDockIcon -bool false
+prepare_isolated_app_instance
+assert_no_dock_tile
+send_main_hotkey
+sleep 0.8
+wait_swift_assert overlay
+assert_no_dock_tile
+send_keycode 53
+sleep 0.4
+wait_swift_assert no-overlay
 kill_all_taglauncher_instances
 sleep 0.4
 swift_assert no-overlay
@@ -1041,6 +1224,22 @@
 sleep 0.4
 swift_assert no-overlay
 
+log "==> QA 4/7: appgrid scroll keeps Space and Esc keyboard routing"
+show_overlay
+for _ in {1..5}; do
+  page_scroll_appgrid
+  send_keycode 49
+  sleep 0.35
+  swift_assert quick-search
+  send_keycode 53
+  sleep 0.25
+  swift_assert overlay
+done
+page_scroll_appgrid
+send_keycode 53
+sleep 0.35
+swift_assert no-overlay
+
 log "==> QA 5/7: clicking outside quick search closes search, not appgrid"
 show_overlay
 send_keycode 49
@@ -1092,8 +1291,9 @@
 SWIFT
   done < <(swift "$screens_swift")
 else
-  rg -Fq 'screenContainingCurrentPointer() ??' "$ROOT_DIR/Apptag/ApptagApp.swift"
-  rg -Fq 'NSMouseInRect(mousePoint, $0.frame, false)' "$ROOT_DIR/Apptag/ApptagApp.swift"
+  rg -Fq 'statusMenuScreenForNextOverlay = overlayController.screenContainingCurrentPointer()' "$ROOT_DIR/Apptag/ApptagApp.swift"
+  rg -Fq 'screenContainingCurrentPointer() ??' "$ROOT_DIR/Apptag/OverlayWindowController.swift"
+  rg -Fq 'NSMouseInRect(mousePoint, $0.frame, false)' "$ROOT_DIR/Apptag/OverlayWindowController.swift"
   log "PASS screen-following static path: single physical display here; code selects NSScreen under current pointer"
 fi
 

--
Gitblit v1.9.3