From 9c317d89a39d0871f15f8282aec6c7f3dde7768c Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Fri, 26 Jun 2026 22:42:44 +0800
Subject: [PATCH] Polish Pro status UI and app grid layout
---
src/Scripts/window_logic_qa.sh | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 113 insertions(+), 3 deletions(-)
diff --git a/src/Scripts/window_logic_qa.sh b/src/Scripts/window_logic_qa.sh
index 6c06ecb..7149bde 100755
--- a/src/Scripts/window_logic_qa.sh
+++ b/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
@@ -438,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
@@ -1113,6 +1204,20 @@
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..6}; do
@@ -1224,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))"
@@ -1318,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"
@@ -1375,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
@@ -1384,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"
--
Gitblit v1.9.3