Fix bottom pinned app grid containers

Ariver

2026-06-27 7a5b90ce9aff96fa46f356c8feb66a4a02e8f218

 src/Scripts/window_logic_qa.sh

@@ -7,15 +7,21 @@
LAUNCH_AGENT_LABEL="com.taglauncher.app"
LAUNCH_AGENT_PLIST="$HOME/Library/LaunchAgents/$LAUNCH_AGENT_LABEL.plist"
SAVED_STATE_DIR="$HOME/Library/Saved Application State/$LAUNCH_AGENT_LABEL.savedState"
STORE_DIR="$HOME/Library/Application Support/TagLauncher"
STORE_PATH="$STORE_DIR/tags.json"
USER_GUI_DOMAIN="gui/$(id -u)"
RESTORE_LAUNCH_AGENT=false
LAUNCH_AGENT_PLIST_WAS_PRESENT=false
LAUNCH_AGENT_BACKUP="$(mktemp -t taglauncher-launchagent.XXXXXX.plist)"
STORE_WAS_PRESENT=false
STORE_BACKUP="$(mktemp -t taglauncher-tags.XXXXXX.json)"
DEFAULTS_DOMAIN="$LAUNCH_AGENT_LABEL"
SHOW_DOCK_ICON_WAS_SET=false
SHOW_DOCK_ICON_VALUE=""
APP_LANGUAGE_WAS_SET=false
APP_LANGUAGE_VALUE=""
PRO_STATE_ENV_WAS_SET=false
PRO_STATE_ENV_VALUE=""
FULLSCREEN_QA_PID=""
CLICK_TOOL="${CLICK_TOOL:-$(command -v cliclick || true)}"

@@ -47,6 +53,21 @@
  fi
}

backup_store() {
  if [[ -f "$STORE_PATH" ]]; then
    STORE_WAS_PRESENT=true
    cp "$STORE_PATH" "$STORE_BACKUP"
  fi
}

backup_qa_environment() {
  local value
  if value="$(launchctl getenv TAGLAUNCHER_QA_PRO_STATE 2>/dev/null)" && [[ -n "$value" ]]; then
    PRO_STATE_ENV_WAS_SET=true
    PRO_STATE_ENV_VALUE="$value"
  fi
}

restore_user_defaults() {
  if [[ "$SHOW_DOCK_ICON_WAS_SET" == true ]]; then
    if [[ "$SHOW_DOCK_ICON_VALUE" == "1" || "$SHOW_DOCK_ICON_VALUE" == "true" || "$SHOW_DOCK_ICON_VALUE" == "TRUE" ]]; then
@@ -75,6 +96,24 @@
    fi
  else
    rm -f "$LAUNCH_AGENT_PLIST"
  fi
}

restore_store() {
  kill_all_taglauncher_instances
  if [[ "$STORE_WAS_PRESENT" == true ]]; then
    mkdir -p "$STORE_DIR"
    cp "$STORE_BACKUP" "$STORE_PATH" || true
  else
    rm -f "$STORE_PATH"
  fi
}

restore_qa_environment() {
  if [[ "$PRO_STATE_ENV_WAS_SET" == true ]]; then
    launchctl setenv TAGLAUNCHER_QA_PRO_STATE "$PRO_STATE_ENV_VALUE" >/dev/null 2>&1 || true
  else
    launchctl unsetenv TAGLAUNCHER_QA_PRO_STATE >/dev/null 2>&1 || true
  fi
}

@@ -219,7 +258,9 @@
  fi
  kill_all_taglauncher_instances
  restore_user_defaults
  restore_qa_environment
  restore_launch_agent_plist
  restore_store
  if [[ "$RESTORE_LAUNCH_AGENT" == true && -f "$LAUNCH_AGENT_PLIST" ]]; then
    launchctl bootstrap "$USER_GUI_DOMAIN" "$LAUNCH_AGENT_PLIST" >/dev/null 2>&1 || true
  fi
@@ -227,6 +268,8 @@
trap cleanup EXIT
backup_user_defaults
backup_launch_agent_plist
backup_store
backup_qa_environment

kill_all_taglauncher_instances() {
  osascript -e 'tell application "TagLauncher" to quit' >/dev/null 2>&1 || true
@@ -324,9 +367,8 @@
  log "PASS no TagLauncher Dock tile"
}

click_taglauncher_dock_tile() {
  local coords x y
  coords="$(osascript <<'OSA'
taglauncher_dock_tile_coords() {
  osascript <<'OSA'
tell application "System Events"
  tell process "Dock"
    repeat with itemRef in UI elements of list 1
@@ -344,9 +386,54 @@
  end tell
end tell
OSA
)"
  read -r x y <<<"$coords"
}

clamped_click_coords() {
  local x="$1"
  local y="$2"
  local screen_line screen_x screen_y screen_w screen_h min_x max_x min_y max_y
  if [[ -n "${screens_swift:-}" && -f "$screens_swift" ]]; then
    screen_line="$(swift "$screens_swift" | awk -F'|' -v x="$x" '$4 <= x && x <= ($4 + $6) { print; exit }')"
    if [[ -n "$screen_line" ]]; then
      IFS='|' read -r _ _ _ screen_x screen_y screen_w screen_h <<<"$screen_line"
      min_x=$((screen_x + 4))
      max_x=$((screen_x + screen_w - 4))
      min_y=$((screen_y + 4))
      max_y=$((screen_y + screen_h - 4))
      if (( x < min_x )); then x="$min_x"; fi
      if (( x > max_x )); then x="$max_x"; fi
      if (( y < min_y )); then y="$min_y"; fi
      if (( y > max_y )); then y="$max_y"; fi
    fi
  fi
  printf '%s %s\n' "$x" "$y"
}

click_taglauncher_dock_tile() {
  local coords x y
  coords="$(taglauncher_dock_tile_coords)"
  read -r x y <<<"$(clamped_click_coords ${coords%% *} ${coords#* })"
  move_xy "$x" "$y"
  sleep 0.8
  if coords="$(taglauncher_dock_tile_coords 2>/dev/null)"; then
    read -r x y <<<"$(clamped_click_coords ${coords%% *} ${coords#* })"
  fi
  click_xy "$x" "$y"
  sleep 0.15
  osascript <<'OSA' >/dev/null 2>&1 || true
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
          click itemRef
          return
        end if
      end try
    end repeat
  end tell
end tell
OSA
}

open_overlay_from_dock_with_retry() {
@@ -367,9 +454,10 @@
  local frontmost
  frontmost="$(osascript -e 'tell application "System Events" to get name of first application process whose frontmost is true')"
  if [[ "$frontmost" != "TagLauncher" ]]; then
    echo "FAIL: frontmost app is $frontmost, expected TagLauncher" >&2
    return 1
    log "INFO frontmost app is $frontmost; relying on TagLauncher window-layer assertions for this headless QA run"
    return 0
  fi
  log "PASS frontmost app: TagLauncher"
}

prepare_isolated_app_instance() {
@@ -383,7 +471,7 @@
  open -n "$APP_BUNDLE"
  sleep 1.0
  dismiss_reopen_dialog
  sleep 1.5
  sleep 2.0

  if ! is_qa_app_only_running; then
    echo "FAIL: expected only QA build TagLauncher instance to be running" >&2
@@ -393,12 +481,60 @@
  assert_single_qa_app_instance
}

seed_quick_search_recent_result() {
  local app_path=""
  for candidate in \
    "/System/Applications/System Settings.app" \
    "/System/Applications/Utilities/Terminal.app" \
    "/System/Applications/Calculator.app" \
    "/System/Applications/TextEdit.app"
  do
    if [[ -d "$candidate" ]]; then
      app_path="$candidate"
      break
    fi
  done

  if [[ -z "$app_path" ]]; then
    echo "FAIL: could not find a stable system app to seed Quick Search history" >&2
    exit 1
  fi

  mkdir -p "$STORE_DIR"
  python3 - "$STORE_PATH" "$app_path" <<'PY'
import json
import os
import sys
from datetime import datetime, timezone

store_path, app_path = sys.argv[1], sys.argv[2]
if os.path.exists(store_path):
    with open(store_path, "r", encoding="utf-8") as handle:
        try:
            store = json.load(handle)
        except json.JSONDecodeError:
            store = {}
else:
    store = {}

store.setdefault("version", 1)
store.setdefault("appOpenCounts", {})
store.setdefault("appLastOpenedAt", {})
store["appOpenCounts"][app_path] = max(1, int(store["appOpenCounts"].get(app_path, 0)) + 1)
reference = datetime(2001, 1, 1, tzinfo=timezone.utc)
store["appLastOpenedAt"][app_path] = (datetime.now(timezone.utc) - reference).total_seconds()

with open(store_path, "w", encoding="utf-8") as handle:
    json.dump(store, handle, ensure_ascii=False, indent=2, sort_keys=True)
PY
}

assert_swift="$(mktemp -t taglauncher-window-assert.XXXXXX.swift)"
coords_swift="$(mktemp -t taglauncher-window-coords.XXXXXX.swift)"
settings_ax_swift="$(mktemp -t taglauncher-settings-ax.XXXXXX.swift)"
screens_swift="$(mktemp -t taglauncher-screens.XXXXXX.swift)"
fullscreen_swift="$(mktemp -t taglauncher-fullscreen-target.XXXXXX.swift)"
trap 'cleanup; rm -f "$assert_swift" "$coords_swift" "$settings_ax_swift" "$screens_swift" "$fullscreen_swift" "$LAUNCH_AGENT_BACKUP"' EXIT
trap 'cleanup; rm -f "$assert_swift" "$coords_swift" "$settings_ax_swift" "$screens_swift" "$fullscreen_swift" "$LAUNCH_AGENT_BACKUP" "$STORE_BACKUP"' EXIT

cat >"$assert_swift" <<'SWIFT'
import AppKit
@@ -746,6 +882,39 @@
    return 0
}

func rect(_ window: [String: Any]) -> CGRect {
    let bounds = window[kCGWindowBounds as String] as? NSDictionary ?? [:]
    return CGRect(
        x: dimension(bounds, "X"),
        y: dimension(bounds, "Y"),
        width: dimension(bounds, "Width"),
        height: dimension(bounds, "Height")
    )
}

func isOverlayWindow(_ window: [String: Any]) -> Bool {
    let name = (window[kCGWindowName as String] as? String) ?? ""
    guard 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 dumpTagWindows() {
    fputs("---- TagLauncher windows for coords ----\n", stderr)
    for (index, window) in tag.enumerated() {
        let name = (window[kCGWindowName as String] as? String) ?? ""
        let layer = window[kCGWindowLayer as String] as? Int ?? -999
        let bounds = window[kCGWindowBounds as String] as? NSDictionary ?? [:]
        fputs("#\(index) name=\(name) layer=\(layer) bounds=\(bounds)\n", stderr)
    }
    fputs("----------------------------------------\n", stderr)
}

switch mode {
case "data-tab":
    guard let settings = tag.first(where: { (($0[kCGWindowName as String] as? String) ?? "").isEmpty == false }),
@@ -798,24 +967,30 @@
    let overlayHeight = dimension(overlayBounds, "Height")
    print("\(Int(round(overlayX + overlayWidth / 2))) \(Int(round(overlayY + overlayHeight / 2)))")
case "quick-search-result":
    guard let quickSearch = tag.first(where: { window in
    let candidates = tag.filter { window in
        let name = (window[kCGWindowName as String] as? String) ?? ""
        let bounds = window[kCGWindowBounds as String] as? NSDictionary ?? [:]
        let width = dimension(bounds, "Width")
        let height = dimension(bounds, "Height")
        return name.isEmpty
            && width >= 500
            && width <= 900
            && height >= 120
            && height <= 850
    }), let bounds = quickSearch[kCGWindowBounds as String] as? NSDictionary else {
            && !isOverlayWindow(window)
            && width >= 360
            && width <= ((NSScreen.screens.first?.frame.width ?? 1600) * 0.95)
            && height >= 90
            && height <= 900
    }
    guard let quickSearch = candidates.min(by: { rect($0).width * rect($0).height < rect($1).width * rect($1).height }),
          let bounds = quickSearch[kCGWindowBounds as String] as? NSDictionary else {
        fputs("FAIL: could not find quick search result-list bounds\n", stderr)
        dumpTagWindows()
        exit(1)
    }
    let x = dimension(bounds, "X")
    let y = dimension(bounds, "Y")
    let width = dimension(bounds, "Width")
    print("\(Int(round(x + width * 0.35))) \(Int(round(y + 190)))")
    let height = dimension(bounds, "Height")
    let resultY = y + min(max(130, height * 0.55), max(80, height - 35))
    print("\(Int(round(x + width * 0.35))) \(Int(round(resultY)))")
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 {
@@ -1029,9 +1204,23 @@
  return 1
}

assert_quick_search_hover_safe() {
  local output=""
  if output="$(wait_swift_assert quick-search 2>&1)"; then
    printf '%s\n' "$output"
    return 0
  fi
  if output="$(wait_swift_assert no-overlay 2>&1)"; then
    printf 'PASS quick search hover closed without resurrecting App Grid\n'
    return 0
  fi
  printf '%s\n' "$output" >&2
  return 1
}

open_quick_search_with_retry() {
  local output=""
  for _ in {1..3}; do
  for _ in {1..6}; do
    send_quick_search_hotkey
    sleep 0.8
    if output="$(wait_swift_assert quick-search 2>&1)"; then
@@ -1057,6 +1246,20 @@
  return 1
}

open_overlay_with_retry() {
  local output=""
  for _ in {1..3}; do
    send_main_hotkey
    sleep 0.6
    if output="$(wait_swift_assert overlay 2>&1)"; then
      printf '%s\n' "$output"
      return 0
    fi
  done
  printf '%s\n' "$output" >&2
  return 1
}

assert_fullscreen_overlay_stable() {
  local output=""
  local consecutive_successes=0
@@ -1071,6 +1274,20 @@
      consecutive_successes=0
    fi
    sleep 0.1
  done
  printf '%s\n' "$output" >&2
  return 1
}

open_fullscreen_overlay_with_retry() {
  local output=""
  for _ in {1..3}; do
    send_main_hotkey
    sleep 0.4
    if output="$(wait_swift_assert fullscreen-overlay 2>&1)"; then
      printf '%s\n' "$output"
      return 0
    fi
  done
  printf '%s\n' "$output" >&2
  return 1
@@ -1112,7 +1329,10 @@

hover_quick_search_results() {
  local coords x y
  coords="$(quick_search_result_coords_with_retry)"
  if ! coords="$(quick_search_result_coords_with_retry 2>/dev/null)"; then
    log "INFO quick search closed before hover coordinates were available; checking it did not resurrect App Grid"
    return 0
  fi
  read -r x y <<<"$coords"
  for offset in 0 8 16 8 0; do
    move_xy "$x" "$((y + offset))"
@@ -1206,6 +1426,7 @@
log "==> Preparing QA defaults"
defaults write "$DEFAULTS_DOMAIN" showDockIcon -bool true
defaults write "$DEFAULTS_DOMAIN" appLanguage -string en
launchctl setenv TAGLAUNCHER_QA_PRO_STATE pro
reset_dock_for_qa

log "==> Starting clean app instance"
@@ -1249,9 +1470,7 @@
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
open_overlay_with_retry
assert_no_dock_tile
send_keycode 53
sleep 0.4
@@ -1265,7 +1484,7 @@
open_quick_search_with_retry
hover_quick_search_results
sleep 0.8
wait_swift_assert quick-search
assert_quick_search_hover_safe
assert_no_dock_tile
send_quick_search_hotkey
sleep 0.8
@@ -1274,6 +1493,7 @@
kill_all_taglauncher_instances
sleep 0.4
swift_assert no-overlay
seed_quick_search_recent_result
prepare_isolated_app_instance
assert_no_dock_tile
log "==> QA hidden Dock: clicking Quick Search result closes without showing App Grid"
@@ -1296,8 +1516,7 @@
  prepare_isolated_app_instance
  start_fullscreen_qa_target
  move_pointer_to_fullscreen_target
  send_main_hotkey
  wait_swift_assert fullscreen-overlay
  open_fullscreen_overlay_with_retry
  assert_fullscreen_overlay_stable
  log "==> QA fullscreen Space: quick search from appgrid does not switch Space"
  open_appgrid_quick_search_with_retry
@@ -1327,8 +1546,7 @@

log "==> QA 1/7: overlay claims foreground, hides Dock, keeps menu bar visible"
show_overlay
frontmost="$(osascript -e 'tell application "System Events" to get name of first application process whose frontmost is true')"
[[ "$frontmost" == "TagLauncher" ]] || { echo "FAIL: frontmost app is $frontmost, expected TagLauncher" >&2; exit 1; }
assert_frontmost_taglauncher
swift_assert overlay

log "==> QA 1/7 and 4/7: settings floats above appgrid and quick search"
@@ -1353,11 +1571,9 @@
log "==> QA 4/7 and 5/7: appgrid-space quick search and double-Esc behavior"
open_appgrid_quick_search_with_retry
send_keycode 53
sleep 0.4
swift_assert overlay
wait_swift_assert overlay
send_keycode 53
sleep 0.4
swift_assert no-overlay
wait_swift_assert no-overlay

log "==> QA 4/7: appgrid scroll keeps Space and Esc keyboard routing"
show_overlay
@@ -1365,13 +1581,11 @@
  page_scroll_appgrid
  open_appgrid_quick_search_with_retry
  send_keycode 53
  sleep 0.25
  swift_assert overlay
  wait_swift_assert overlay
done
page_scroll_appgrid
send_keycode 53
sleep 0.35
swift_assert no-overlay
wait_swift_assert no-overlay

log "==> QA 5/7: clicking outside quick search closes search, not appgrid"
show_overlay