ucu-mcp 0.4.3 → 0.5.1

package/dist/src/platform/macos/element.js

@@ -2,6 +2,20 @@ import { execFileSync } from "node:child_process";
 import { ElementNotFoundError } from "../../util/errors.js";
 import { rethrowElementActionError } from "./helpers.js";
 import { jxaElementActionHelpers } from "../jxa-helpers.js";
+/**
+ * App-name hints for which AXPress is known to be silently swallowed
+ * (Tauri custom window decorations, some Electron controls). When the target
+ * app matches, clickElement/clickMenuBarExtra skip AXPress and go straight to
+ * a coordinate click. Conservative starting set — extend as more silent-swallow
+ * apps are confirmed.
+ */
+const AX_SILENT_APP_HINTS = ["tauri"];
+function preferCoordinateClick(appName) {
+    if (!appName)
+        return false;
+    const n = appName.toLowerCase();
+    return AX_SILENT_APP_HINTS.some((h) => n.includes(h));
+}
 function prepareCache(elementId) {
     this.evictExpiredCacheEntries();
     const cached = this.elementCache.get(elementId);
@@ -10,19 +24,65 @@ function prepareCache(elementId) {
     }
     return this.elementCache.get(elementId) ?? null;
 }
+/**
+ * Shared JXA snippet: read an observable state signature from an AX element.
+ * Used by clickElement/clickMenuBarExtra to verify whether AXPress actually
+ * changed anything (Tauri/Electron silently swallow AXPress without throwing).
+ * Returns a string concatenation of value/focused/selected (each defensively
+ * read; missing attributes contribute ''). An empty signature means the element
+ * exposes no observable state — verification is inconclusive.
+ */
+const JXA_STATE_SIGNATURE = `
+  function stateSignature(elem) {
+    var parts = [];
+    try { var v = elem.value(); parts.push('v=' + (v === undefined || v === null ? '' : String(v))); } catch(e) { parts.push('v='); }
+    try { parts.push('f=' + (elem.focused ? (elem.focused() ? 1 : 0) : '')); } catch(e) { parts.push('f='); }
+    try { parts.push('s=' + (elem.selected ? (elem.selected() ? 1 : 0) : '')); } catch(e) { parts.push('s='); }
+    return parts.join('|');
+  }
+  // Brief synchronous spin to let an async AXPress propagate state.
+  function spinMs(ms) { var t = Date.now(); while (Date.now() - t < ms) {} }
+`;
+/**
+ * Shared JXA snippet: perform a coordinate click at the element's bounds center.
+ * Returns the {x, y} used, or null if bounds could not be read.
+ */
+const JXA_COORDINATE_CLICK = `
+  function coordinateClick(elem) {
+    var pos = elem.position();
+    var sz = elem.size();
+    var cx = pos[0] + sz[0] / 2;
+    var cy = pos[1] + sz[1] / 2;
+    ObjC.import('CoreGraphics');
+    var src = $.CGEventSourceCreate($.kCGEventSourceStateHIDSystemState);
+    var pt = $.CGPointMake(cx, cy);
+    var down = $.CGEventCreateMouseEvent(src, $.kCGEventLeftMouseDown, pt, $.kCGMouseButtonLeft);
+    $.CGEventPost($.kCGHIDEventTap, down);
+    var up = $.CGEventCreateMouseEvent(src, $.kCGEventLeftMouseUp, pt, $.kCGMouseButtonLeft);
+    $.CGEventPost($.kCGHIDEventTap, up);
+    return {x: cx, y: cy};
+  }
+`;
 export async function clickElement(elementId, app) {
     const elementIdLiteral = JSON.stringify(elementId);
     const effectiveApp = app || this.activeTarget?.appName;
     const appLiteral = JSON.stringify(effectiveApp || "");
     const cachedDescriptor = prepareCache.call(this, elementId);
     const cachedJson = JSON.stringify(cachedDescriptor);
+    const preferCoord = preferCoordinateClick(effectiveApp);
     const jxaScript = `
     var se = Application('System Events');
     var _result = null;
     ${jxaElementActionHelpers()}
+    ${JXA_STATE_SIGNATURE}
+    ${JXA_COORDINATE_CLICK}
     var elemPath = ${elementIdLiteral};
     var appName = ${appLiteral};
+    // 容忍大小写/空格/连字符/下划线变体（cc-switch vs CC Switch vs cc_switch）
+    var _norm = function(s) { return String(s||'').toLowerCase().split(' ').join('').split('-').join('').split('_').join(''); };
+    var appNorm = _norm(appName);
     var cached = ${cachedJson};
+    var preferCoord = ${preferCoord ? "true" : "false"};
 
     var elem = resolveElementInApp(elemPath, appName) || resolveElementByFullPath(elemPath);
     if (elem && !descriptorMatches(elem)) {
@@ -34,27 +94,51 @@ export async function clickElement(elementId, app) {
 
     if (!elem) {
       _result = {success: false, error: "Element not found: " + elemPath};
+    } else if (preferCoord) {
+      // 启发式命中（Tauri 等已知静默吞 AXPress 的应用）：直接坐标点击
+      try {
+        coordinateClick(elem);
+        _result = {success: true, method: "coordinate", verified: false};
+      } catch(e) {
+        _result = {success: false, error: "Could not click element (coordinate): " + String(e.message || e)};
+      }
     } else {
+      // AXPress + verify：采样前后状态签名，无变化则降级坐标
+      var sigBefore = stateSignature(elem);
+      var axpressThrew = false;
       try {
         elem.actions.AXPress.perform();
-        _result = {success: true};
       } catch(e) {
+        axpressThrew = true;
+      }
+      if (axpressThrew) {
+        // AXPress 抛异常 → 坐标 fallback
         try {
-          var pos = elem.position();
-          var sz = elem.size();
-          var cx = pos[0] + sz[0] / 2;
-          var cy = pos[1] + sz[1] / 2;
-          ObjC.import('CoreGraphics');
-          var src = $.CGEventSourceCreate($.kCGEventSourceStateHIDSystemState);
-          var pt = $.CGPointMake(cx, cy);
-          var down = $.CGEventCreateMouseEvent(src, $.kCGEventLeftMouseDown, pt, $.kCGMouseButtonLeft);
-          $.CGEventPost($.kCGHIDEventTap, down);
-          var up = $.CGEventCreateMouseEvent(src, $.kCGEventLeftMouseUp, pt, $.kCGMouseButtonLeft);
-          $.CGEventPost($.kCGHIDEventTap, up);
-          _result = {success: true};
+          coordinateClick(elem);
+          _result = {success: true, method: "coordinate", verified: false};
         } catch(e2) {
           _result = {success: false, error: "Could not click element: " + String(e2.message || e2)};
         }
+      } else {
+        // AXPress 未抛异常：spin 等待异步生效，再采样签名判断是否真的生效
+        spinMs(80);
+        var sigAfter = stateSignature(elem);
+        if (sigBefore !== '' && sigAfter !== sigBefore) {
+          // 状态变化 → AXPress 生效
+          _result = {success: true, method: "axpress", verified: true};
+        } else if (sigBefore === '' && sigAfter === '') {
+          // 无可观测状态（纯按钮无 value/focused/selected）：无法 verify，
+          // 保守认为 AXPress 可能成功（不降级坐标，避免对正常按钮误伤）
+          _result = {success: true, method: "axpress", verified: false};
+        } else {
+          // 有可观测状态但无变化 → 静默吞，降级坐标
+          try {
+            coordinateClick(elem);
+            _result = {success: true, method: "coordinate", verified: false};
+          } catch(e3) {
+            _result = {success: false, error: "Could not click element (coordinate fallback): " + String(e3.message || e3)};
+          }
+        }
       }
     }
     JSON.stringify(_result);
@@ -70,9 +154,14 @@ export async function clickElement(elementId, app) {
                 ? new Error(result.error)
                 : new ElementNotFoundError(elementId);
         }
+        return {
+            method: result.method ?? "axpress",
+            verified: Boolean(result.verified),
+        };
     }
     catch (error) {
         rethrowElementActionError(error, "click_element", elementId);
+        return { method: "axpress", verified: false }; // unreachable — rethrow throws
     }
 }
 export async function typeInElement(elementId, text, app, clearFirst) {
@@ -88,6 +177,9 @@ export async function typeInElement(elementId, text, app, clearFirst) {
     ${jxaElementActionHelpers()}
     var elemPath = ${elementIdLiteral};
     var appName = ${appLiteral};
+    // 容忍大小写/空格/连字符/下划线变体（cc-switch vs CC Switch vs cc_switch）
+    var _norm = function(s) { return String(s||'').toLowerCase().split(' ').join('').split('-').join('').split('_').join(''); };
+    var appNorm = _norm(appName);
     var textToType = ${textLiteral};
     var shouldClear = ${clearFirst ? "true" : "false"};
     var cached = ${cachedJson};
@@ -167,6 +259,9 @@ export async function setElementValue(elementId, value, app) {
     ${jxaElementActionHelpers()}
     var elemPath = ${elementIdLiteral};
     var appName = ${appLiteral};
+    // 容忍大小写/空格/连字符/下划线变体（cc-switch vs CC Switch vs cc_switch）
+    var _norm = function(s) { return String(s||'').toLowerCase().split(' ').join('').split('-').join('').split('_').join(''); };
+    var appNorm = _norm(appName);
     var valueToSet = ${valueLiteral};
     var cached = ${cachedJson};
 
@@ -210,3 +305,272 @@ export async function setElementValue(elementId, value, app) {
         rethrowElementActionError(error, "set_value", elementId);
     }
 }
+export async function findMenuBarExtra(app) {
+    const appLiteral = JSON.stringify(app);
+    // 两阶段 JXA：先遍历 app 自身 menuBarItems（host:"self"），若为空或只有 Apple 菜单，
+    // 再遍历 SystemUIServer.menuBarItems 找第三方托盘 status item（host:"systemuiserver"）。
+    // 纯 LSUIElement 托盘应用的 status item 由 SystemUIServer 进程托管，不在 app 自身进程里。
+    const jxaScript = `
+    var se = Application('System Events');
+    var _result = null;
+    var appName = ${appLiteral};
+    // 容忍大小写/空格/连字符/下划线变体（cc-switch vs CC Switch vs cc_switch）
+    var _norm = function(s) { return String(s||'').toLowerCase().split(' ').join('').split('-').join('').split('_').join(''); };
+    var appNorm = _norm(appName);
+
+    // 双向 includes 容忍 "CC Switch" vs "cc-switch" 之类长度差异
+    var _matchApp = function(itemNorm) {
+      if (!itemNorm) return false;
+      return itemNorm === appNorm || itemNorm.indexOf(appNorm) !== -1 || appNorm.indexOf(itemNorm) !== -1;
+    };
+
+    var _readItem = function(item, mb, i, host) {
+      var desc = '', nm = '';
+      try { desc = item.description(); } catch(e) {}
+      try { nm = item.name(); } catch(e) {}
+      var pos = [0,0], sz = [0,0];
+      try { pos = item.position(); } catch(e) {}
+      try { sz = item.size(); } catch(e) {}
+      if (sz[0] === 0 && sz[1] === 0) return null;
+      return {menuBar: mb, index: i, name: nm, description: desc, x: pos[0], y: pos[1], width: sz[0], height: sz[1], host: host};
+    };
+
+    try {
+      var procs = se.processes;
+      var p = null;
+      for (var k = 0; k < procs.length; k++) {
+        var pn = '';
+        try { pn = procs[k].name(); } catch(e) {}
+        if (_norm(pn) === appNorm) { p = procs[k]; break; }
+      }
+
+      var items = [];
+
+      // 阶段 1：app 自身 menuBarItems（host:"self"）
+      if (p) {
+        try {
+          var menuBars = p.menuBars();
+          for (var mb = 0; mb < menuBars.length; mb++) {
+            var mbItems;
+            try { mbItems = menuBars[mb].menuBarItems(); } catch(e) { continue; }
+            for (var i = 0; i < mbItems.length; i++) {
+              var rec = _readItem(mbItems[i], mb, i, "self");
+              if (rec) items.push(rec);
+            }
+          }
+        } catch(e) {}
+      }
+
+      // 是否需要阶段 2：app 自身无 item，或仅含 Apple 菜单（index 0 的 app-name 项）
+      var hasNonApple = false;
+      for (var j = 0; j < items.length; j++) {
+        if (_norm(items[j].name) !== "apple") { hasNonApple = true; break; }
+      }
+
+      // 阶段 2：SystemUIServer 托管的第三方托盘 status item（host:"systemuiserver"）
+      // 仅当 app 自身没有可点击的非 Apple 项时才查 SystemUIServer，避免对有窗口的应用产生噪音。
+      if (!hasNonApple) {
+        try {
+          var suiProcs = se.processes.byName("SystemUIServer");
+          if (suiProcs) {
+            var suiBars = suiProcs.menuBars();
+            for (var smb = 0; smb < suiBars.length; smb++) {
+              var suiItems;
+              try { suiItems = suiBars[smb].menuBarItems(); } catch(e) { continue; }
+              for (var si = 0; si < suiItems.length; si++) {
+                var sItem = suiItems[si];
+                var sDesc = '', sNm = '';
+                try { sDesc = sItem.description(); } catch(e) {}
+                try { sNm = sItem.name(); } catch(e) {}
+                // 按 description/name 匹配目标 app（status item 的 description 通常是 app 名）
+                if (_matchApp(_norm(sDesc)) || _matchApp(_norm(sNm))) {
+                  var sRec = _readItem(sItem, smb, si, "systemuiserver");
+                  if (sRec) {
+                    // 保留匹配信号，供 click 二次定位
+                    sRec.name = sNm; sRec.description = sDesc;
+                    items.push(sRec);
+                  }
+                }
+              }
+            }
+          }
+        } catch(e) {
+          // SystemUIServer 不可达（罕见），忽略，继续返回阶段 1 结果
+        }
+      }
+
+      if (!p && items.length === 0) {
+        _result = {error: "process not found: " + appName, items: []};
+      } else {
+        _result = {items: items};
+      }
+    } catch(e) {
+      _result = {error: "menu bar AX read failed: " + String(e.message || e), items: []};
+    }
+    JSON.stringify(_result);
+  `;
+    let out;
+    try {
+        out = execFileSync("osascript", ["-l", "JavaScript", "-e", jxaScript], { encoding: "utf-8", timeout: 15000 }).trim();
+    }
+    catch (error) {
+        rethrowElementActionError(error, "find_menu_bar_extra", app);
+        return []; // unreachable — rethrow throws
+    }
+    const parsed = JSON.parse(out);
+    if (parsed.error) {
+        throw new Error(parsed.error);
+    }
+    return parsed.items;
+}
+export function matchMenuBarExtra(items, selector) {
+    if (items.length === 0)
+        return undefined;
+    let filtered = items;
+    if (selector.description) {
+        const d = selector.description.toLowerCase();
+        filtered = filtered.filter((it) => (it.description || "").toLowerCase().includes(d) || (it.name || "").toLowerCase().includes(d));
+    }
+    else if (selector.name) {
+        const n = selector.name.toLowerCase();
+        filtered = filtered.filter((it) => (it.name || "").toLowerCase().includes(n) || (it.description || "").toLowerCase().includes(n));
+    }
+    else if (selector.index === undefined) {
+        // 无 selector 时排除 Apple 菜单（macOS 每个 app 的 index 0 app-name 项），
+        // 否则 click_menu_bar_extra(app) 不带 selector 会误点 Apple 菜单。
+        // 注意：SystemUIServer 托管的第三方托盘 item 不应被此过滤误删——它们的 name 通常非 "apple"。
+        filtered = filtered.filter((it) => (it.name || "").toLowerCase() !== "apple");
+    }
+    if (selector.index !== undefined) {
+        return filtered[selector.index];
+    }
+    return filtered[0];
+}
+export async function clickMenuBarExtra(app, selector = {}) {
+    const items = await this.findMenuBarExtra(app);
+    const target = matchMenuBarExtra(items, selector);
+    if (!target) {
+        throw new ElementNotFoundError(`menu bar extra not found in ${app} (selector: ${JSON.stringify(selector)}; ${items.length} items scanned)`);
+    }
+    const appLiteral = JSON.stringify(app);
+    const mb = target.menuBar;
+    const idx = target.index;
+    const host = target.host;
+    const tgtNameLiteral = JSON.stringify(target.name || "");
+    const tgtDescLiteral = JSON.stringify(target.description || "");
+    const preferCoord = preferCoordinateClick(app);
+    // AXPress + verify-then-fallback（与 clickElement 同模式，应对 Tauri 等静默吞）。
+    // host==="systemuiserver" 时在 SystemUIServer 进程上重定位（托盘 status item 由它托管），
+    // SystemUIServer.menuBarItems 顺序不稳定，用保存的 name/description 二次匹配定位具体 item。
+    // host==="self" 时按 app 进程的 menuBars()[mb].menuBarItems()[idx] 重定位（稳定）。
+    const resolveItemBlock = host === "systemuiserver"
+        ? `// SystemUIServer 托管的第三方托盘：按 name/description 二次匹配（顺序不稳定）
+      var suiProc = null;
+      try { suiProc = se.processes.byName("SystemUIServer"); } catch(e) {}
+      var item = null;
+      if (suiProc) {
+        var suiBars = suiProc.menuBars();
+        outer: for (var b = 0; b < suiBars.length; b++) {
+          var suiItems;
+          try { suiItems = suiBars[b].menuBarItems(); } catch(e) { continue; }
+          for (var ii = 0; ii < suiItems.length; ii++) {
+            var it = suiItems[ii];
+            var iDesc = '', iNm = '';
+            try { iDesc = it.description(); } catch(e) {}
+            try { iNm = it.name(); } catch(e) {}
+            if (_matchApp(_norm(iDesc)) || _matchApp(_norm(iNm))
+                || _norm(iDesc) === tgtDescNorm || _norm(iNm) === tgtNameNorm) {
+              item = it; break outer;
+            }
+          }
+        }
+      }
+      if (!item) { _result = {success: false, error: "SystemUIServer status item not found for " + appName}; }`
+        : `// app 自身 menu bar：按 menuBar/index 重定位（稳定）
+      if (!p) {
+        _result = {success: false, error: "process not found: " + appName};
+      } else {
+        var item = p.menuBars()[${mb}].menuBarItems()[${idx}];
+      }`;
+    const jxaScript = `
+    var se = Application('System Events');
+    var _result = null;
+    var appName = ${appLiteral};
+    var tgtName = ${tgtNameLiteral};
+    var tgtDesc = ${tgtDescLiteral};
+    ${JXA_STATE_SIGNATURE}
+    ${JXA_COORDINATE_CLICK}
+    // 容忍大小写/空格/连字符/下划线变体（cc-switch vs CC Switch vs cc_switch）
+    var _norm = function(s) { return String(s||'').toLowerCase().split(' ').join('').split('-').join('').split('_').join(''); };
+    var appNorm = _norm(appName);
+    var tgtNameNorm = _norm(tgtName);
+    var tgtDescNorm = _norm(tgtDesc);
+    var preferCoord = ${preferCoord ? "true" : "false"};
+    var _matchApp = function(itemNorm) {
+      if (!itemNorm) return false;
+      return itemNorm === appNorm || itemNorm.indexOf(appNorm) !== -1 || appNorm.indexOf(itemNorm) !== -1;
+    };
+    try {
+      var procs = se.processes;
+      var p = null;
+      for (var k = 0; k < procs.length; k++) {
+        var pn = '';
+        try { pn = procs[k].name(); } catch(e) {}
+        if (_norm(pn) === appNorm) { p = procs[k]; break; }
+      }
+      ${resolveItemBlock}
+      if (!_result && item) {
+        if (preferCoord) {
+          // 启发式命中：直接坐标点击
+          coordinateClick(item);
+          _result = {success: true, method: "coordinate", verified: false};
+        } else {
+          // AXPress + verify
+          var sigBefore = stateSignature(item);
+          var axpressThrew = false;
+          try {
+            item.actions.AXPress.perform();
+          } catch(e) {
+            axpressThrew = true;
+          }
+          if (axpressThrew) {
+            coordinateClick(item);
+            _result = {success: true, method: "coordinate", verified: false};
+          } else {
+            spinMs(80);
+            var sigAfter = stateSignature(item);
+            if (sigBefore !== '' && sigAfter !== sigBefore) {
+              _result = {success: true, method: "axpress", verified: true};
+            } else if (sigBefore === '' && sigAfter === '') {
+              // 托盘 status item 通常无可观测状态（无 value/selected）；AXPress 开菜单的效果
+              // 难以从 item 本身验证。保守认为成功（菜单是否打开由后续 find_element 判断）。
+              _result = {success: true, method: "axpress", verified: false};
+            } else {
+              coordinateClick(item);
+              _result = {success: true, method: "coordinate", verified: false};
+            }
+          }
+        }
+      }
+    } catch(e) {
+      _result = {success: false, error: String(e.message || e)};
+    }
+    JSON.stringify(_result);
+  `;
+    let out;
+    try {
+        out = execFileSync("osascript", ["-l", "JavaScript", "-e", jxaScript], { encoding: "utf-8", timeout: 15000 }).trim();
+    }
+    catch (error) {
+        rethrowElementActionError(error, "click_menu_bar_extra", app);
+        return { method: "axpress", verified: false }; // unreachable — rethrow throws
+    }
+    const result = JSON.parse(out);
+    if (!result.success) {
+        throw new Error(`click_menu_bar_extra failed in ${app}: ${result.error}`);
+    }
+    return {
+        method: result.method ?? "axpress",
+        verified: Boolean(result.verified),
+    };
+}

package/dist/src/platform/macos/focus.d.ts

@@ -1,3 +1,13 @@
 import type { MacOSPlatform } from "./base.js";
+/**
+ * @deprecated Focus management is intentionally disabled. CGEvent input
+ * synthesis (click/type/key) works at the HID layer and does not require the
+ * target app to be frontmost, so stealing/restoring focus is unnecessary and
+ * could disrupt the user. `saveFocus`/`restoreFocus` are retained for API
+ * compatibility but are NOT called from the action pipeline — see the
+ * `not.toHaveBeenCalled()` assertions in `tools-layer.test.ts` that lock this
+ * disabled state. Do not wire these into new code; prefer CGEvent-based input.
+ */
 export declare function saveFocus(this: MacOSPlatform): Promise<void>;
+/** @deprecated See {@link saveFocus} — intentionally disabled, not called from the action pipeline. */
 export declare function restoreFocus(this: MacOSPlatform): Promise<void>;

package/dist/src/platform/macos/focus.js

@@ -1,4 +1,13 @@
 import { execFileSync } from "node:child_process";
+/**
+ * @deprecated Focus management is intentionally disabled. CGEvent input
+ * synthesis (click/type/key) works at the HID layer and does not require the
+ * target app to be frontmost, so stealing/restoring focus is unnecessary and
+ * could disrupt the user. `saveFocus`/`restoreFocus` are retained for API
+ * compatibility but are NOT called from the action pipeline — see the
+ * `not.toHaveBeenCalled()` assertions in `tools-layer.test.ts` that lock this
+ * disabled state. Do not wire these into new code; prefer CGEvent-based input.
+ */
 export async function saveFocus() {
     try {
         const apps = await this.listApps();
@@ -16,6 +25,7 @@ export async function saveFocus() {
         this.savedFocus = undefined;
     }
 }
+/** @deprecated See {@link saveFocus} — intentionally disabled, not called from the action pipeline. */
 export async function restoreFocus() {
     if (!this.savedFocus)
         return;

package/dist/src/platform/macos/screen.js

@@ -74,7 +74,7 @@ export async function ocr(display, region) {
         const nativeResult = await ocrNative(tmpPath, scaleFactor, region);
         if (nativeResult)
             return nativeResult;
-        return await ocrJxa(tmpPath, screenSize, scaleFactor, region, buf);
+        return await ocrJxa(tmpPath, screenSize, scaleFactor, region);
     }
     finally {
         await unlink(tmpPath).catch(() => { });
@@ -83,6 +83,9 @@ export async function ocr(display, region) {
 async function ocrNative(tmpPath, scaleFactor, region) {
     const screenDirname = dirname(fileURLToPath(import.meta.url));
     const candidates = [
+        // npm prod: screen.js 编译落在 dist/src/platform/macos/（4 级深），到包根需 4 级 ../
+        join(screenDirname, "..", "..", "..", "..", "native", "ocr", "ocr-helper"),
+        // dev: screen.ts 在 src/platform/macos/（3 级深），3 级到包根
         join(screenDirname, "..", "..", "..", "native", "ocr", "ocr-helper"),
         join(screenDirname, "..", "..", "native", "ocr", "ocr-helper"),
         join(process.cwd(), "native", "ocr", "ocr-helper"),
@@ -120,45 +123,47 @@ async function ocrNative(tmpPath, scaleFactor, region) {
         return null;
     }
 }
-async function ocrJxa(tmpPath, screenSize, scaleFactor, region, buf) {
+async function ocrJxa(tmpPath, screenSize, scaleFactor, region) {
     const pathLiteral = JSON.stringify(tmpPath);
     const jxaScript = `
     function run() {
       ObjC.import('Vision');
       ObjC.import('AppKit');
       ObjC.import('Foundation');
-      var app = Application.currentApplication();
-      app.includeStandardAdditions = true;
       var path = ${pathLiteral};
-      var url = $.NSURL.fileURLWithPath(path);
-      var image = $.NSImage.alloc.initWithContentsOfURL(url);
-      if (!image || !image.isValid) {
+      var fm = $.NSFileManager.defaultManager;
+      if (!fm.fileExistsAtPath(path)) {
         return JSON.stringify({error: "Failed to load screenshot image", elements: [], fullText: ""});
       }
-      var cgImage = image.CGImageForProposedRectContextHints(null, null, null);
-      if (!cgImage) {
+      var url = $.NSURL.fileURLWithPath(path);
+      var handler = $.VNImageRequestHandler.alloc.initWithURLOptions(url, $());
+      if (!handler) {
         return JSON.stringify({error: "Failed to get CGImage from screenshot", elements: [], fullText: ""});
       }
       var request = $.VNRecognizeTextRequest.alloc.init;
       request.recognitionLevel = $.VNRequestTextRecognitionLevelAccurate;
       request.usesLanguageCorrection = true;
-      var handler = $.VNImageRequestHandler.alloc.initWithCGImageOptions(cgImage, null);
-      var performError = $();
-      var success = handler.performRequestsError([request], performError);
+      var performError = Ref();
+      var success = handler.performRequestsError($([request]), performError);
       if (!success) {
         return JSON.stringify({error: "OCR request failed", elements: [], fullText: ""});
       }
       var results = request.results;
+      var image = $.NSImage.alloc.initWithContentsOfURL(url);
+      if (!image || $(image.representations()).count === 0) {
+        return JSON.stringify({error: "Failed to load screenshot image", elements: [], fullText: ""});
+      }
+      var rep = image.representations().objectAtIndex(0);
+      var imgWidth = rep.pixelsWide;
+      var imgHeight = rep.pixelsHigh;
       var elements = [];
       var fullTextParts = [];
-      var imgWidth = cgImage.width;
-      var imgHeight = cgImage.height;
       for (var i = 0; i < results.count; i++) {
         var obs = $(results).objectAtIndex(i);
         var candidates = obs.topCandidates(1);
-        if (candidates && candidates.count > 0) {
+        if (candidates && $(candidates).count > 0) {
           var candidate = $(candidates).objectAtIndex(0);
-          var text = candidate.string.toString();
+          var text = ObjC.unwrap(candidate.string);
           var confidence = candidate.confidence;
           var bbox = obs.boundingBox;
           var bx = bbox.origin.x * imgWidth;
@@ -183,8 +188,6 @@ async function ocrJxa(tmpPath, screenSize, scaleFactor, region, buf) {
                 : "";
         throw new CaptureError(`ocr failed: ${parsed.error}${hint}`);
     }
-    const imgWidth = buf.readUInt32BE(16);
-    const scaleFactorX = screenSize.width / (region ? region.width : (imgWidth / scaleFactor));
     const elements = parsed.elements.map((el) => ({
         text: el.text,
         x: Math.round(el.x / scaleFactor) + (region ? region.x : 0),

package/dist/src/platform/macos/window.js

@@ -53,6 +53,25 @@ export async function focusApp(app) {
         await new Promise((resolve) => setTimeout(resolve, 150));
     } while (Date.now() < deadline);
     if (!target) {
+        // 托盘应用（LSUIElement，如 cc-switch）没有常规窗口——回退找菜单栏 status item，
+        // 建立 tray activeTarget（windowId='tray'，validateActiveTarget 对它特判不查窗口）。
+        try {
+            const extras = await this.findMenuBarExtra(app);
+            if (extras.length > 0) {
+                this.activeTarget = {
+                    targetId: randomUUID(),
+                    appName: app,
+                    pid: 0,
+                    windowId: "tray",
+                    title: "",
+                    capturedAt: new Date().toISOString(),
+                };
+                return this.activeTarget;
+            }
+        }
+        catch {
+            // findMenuBarExtra 失败（AX 权限/进程不可达等），落到下面的 WindowNotFoundError
+        }
         this.activeTarget = undefined;
         const err = new WindowNotFoundError(app, { hint: "list_windows returned no match for this app. If the app is running, " +
                 "the most likely cause is that it is an Electron app whose AX tree is " +
@@ -194,6 +213,9 @@ function resolveNativeHelper(folder, binary) {
         return override === null ? null : override;
     }
     const candidates = [
+        // npm prod: window.js 在 dist/src/platform/macos/（4 级深），到包根需 4 级 ../
+        join(__windowDirname, "..", "..", "..", "..", "native", folder, binary),
+        // dev: window.ts 在 src/platform/macos/（3 级深），3 级到包根
         join(__windowDirname, "..", "..", "..", "native", folder, binary),
         join(__windowDirname, "..", "..", "native", folder, binary),
     ];

package/dist/src/platform/windows.d.ts

@@ -1,4 +1,4 @@
-import type { Platform, ScreenRegion, ScreenSize, CursorPosition, WindowInfo, WindowState, OcrResult, FindElementOptions, FindElementResponse } from "./base.js";
+import type { Platform, ScreenRegion, ScreenSize, CursorPosition, WindowInfo, WindowState, OcrResult, FindElementOptions, FindElementResponse, ClickResult } from "./base.js";
 export declare class WindowsPlatform implements Platform {
     screenshot(_display?: number, _region?: ScreenRegion): Promise<Buffer>;
     getScreenSize(_display?: number): ScreenSize;
@@ -13,7 +13,7 @@ export declare class WindowsPlatform implements Platform {
     key(_keys: string[]): Promise<void>;
     ocr(_display?: number, _region?: ScreenRegion): Promise<OcrResult>;
     findElement(_options: FindElementOptions): Promise<FindElementResponse>;
-    clickElement(_elementId: string, _app?: string): Promise<void>;
+    clickElement(_elementId: string, _app?: string): Promise<ClickResult>;
     typeInElement(_elementId: string, _text: string, _app?: string, _clearFirst?: boolean): Promise<void>;
     readClipboard(): Promise<string>;
     writeClipboard(text: string): Promise<void>;