@swmansion/argent 0.30.0 → 0.30.1-next.1

package/dist/cli-cmds.mjs

@@ -35549,7 +35549,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.30.0";
+    return "0.30.1-next.1";
   }
   return "0.0.0";
 }

package/dist/installer.mjs

@@ -16875,7 +16875,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.30.0";
+    return "0.30.1-next.1";
   }
   return "0.0.0";
 }

package/dist/tool-server.cjs

@@ -100766,7 +100766,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.30.0";
+    return "0.30.1-next.1";
   }
   return "0.0.0";
 }
@@ -102129,7 +102129,7 @@ var import_node_path6 = __toESM(require("node:path"));
 var import_semver2 = __toESM(require_semver2());
 
 // ../tool-server/package.json
-var version2 = "0.30.0";
+var version2 = "0.30.1";
 
 // ../tool-server/src/utils/update-checker.ts
 var import_update_core = __toESM(require_dist7());
@@ -133053,12 +133053,18 @@ async function injectAndroidNamedKey(serial, name) {
 
 // ../tool-server/src/blueprints/android-tv-control.ts
 var ANDROID_TV_CONTROL_NAMESPACE = "AndroidTvControl";
-function androidTvControlRef(device) {
+function androidTvControlRef(device, registry2) {
   return {
     urn: `${ANDROID_TV_CONTROL_NAMESPACE}:${device.id}`,
-    options: { device }
+    options: registry2 ? { device, readHelperHierarchy: () => readHelperHierarchy(registry2, device) } : { device }
   };
 }
+async function readHelperHierarchy(registry2, device) {
+  const ref = androidDevtoolsRef(device);
+  const devtools = await registry2.resolveService(ref.urn, ref.options);
+  const { xml } = await devtools.getHierarchy({ clearCache: true });
+  return xml;
+}
 var KEYEVENTS = {
   up: 19,
   // KEYCODE_DPAD_UP
@@ -133098,14 +133104,24 @@ function valueOf(attrs) {
   const text = (attrs.text ?? "").trim();
   return cd && text && cd !== text ? text : "";
 }
+var WINDOW_TYPE_INPUT_METHOD = "2";
+function hasFocusedNode(node2) {
+  return attrIsTrue(node2.attrs, "focused") || node2.children.some(hasFocusedNode);
+}
+function activeWindow(root) {
+  const windows = root.children.filter((c) => c.attrs["window-type"] !== void 0);
+  if (windows.length === 0) return root;
+  return windows.find(hasFocusedNode) ?? windows.find((w) => w.attrs["window-type"] !== WINDOW_TYPE_INPUT_METHOD) ?? windows[0];
+}
 function collectTvNodes(xml) {
   const root = parseUiAutomatorXml(xml);
   const focusable = [];
   let focused = null;
   if (!root) return { focused, focusable };
-  const stack = [root];
+  const stack = [activeWindow(root)];
   while (stack.length > 0) {
     const node2 = stack.pop();
+    if (node2.attrs["visible-to-user"] === "false") continue;
     for (let i = node2.children.length - 1; i >= 0; i--) stack.push(node2.children[i]);
     const attrs = node2.attrs;
     const isFocusable = attrIsTrue(attrs, "focusable");
@@ -133156,7 +133172,7 @@ var androidTvControlBlueprint = {
         `${ANDROID_TV_CONTROL_NAMESPACE}.factory requires a resolved DeviceInfo via options.device. Use androidTvControlRef(device) when registering the service ref.`
       );
     }
-    const { device } = opts;
+    const { device, readHelperHierarchy: readHelperHierarchy2 } = opts;
     if (typeof device.id !== "string" || device.id.length === 0) {
       throw new Error(
         `${ANDROID_TV_CONTROL_NAMESPACE}.factory requires a non-empty device.id; got ${JSON.stringify(device.id)}.`
@@ -133186,14 +133202,32 @@ var androidTvControlBlueprint = {
         { timeoutMs: 2e4 }
       )).toString("utf-8");
       if (!raw.includes("<hierarchy")) {
+        const output2 = raw.trim().slice(0, 200);
+        if (/\bKilled\b/.test(output2)) {
+          throw new Error(
+            `uiautomator could not capture the screen: ${output2}. Another UiAutomation client (the argent devtools helper, or a test runner such as Espresso or Appium) holds the accessibility connection. Stop it, for the helper with \`adb shell am force-stop com.argent.androiddevtools\`, and try again.`
+          );
+        }
         throw new Error(
-          `uiautomator could not capture the screen: ${raw.trim().slice(0, 200)}. The device may be locked or showing a secure overlay \u2014 take a screenshot to confirm.`
+          `uiautomator could not capture the screen: ${output2}. The device may be locked or showing a secure overlay \u2014 take a screenshot to confirm.`
         );
       }
       return raw;
     }
+    async function readHierarchy() {
+      if (readHelperHierarchy2) {
+        try {
+          return await readHelperHierarchy2();
+        } catch (err) {
+          console.debug(
+            `[android-tv-control] devtools helper failed, falling back to uiautomator dump: ${err instanceof Error ? err.message : String(err)}`
+          );
+        }
+      }
+      return dumpHierarchy();
+    }
     async function read() {
-      return collectTvNodes(await dumpHierarchy());
+      return collectTvNodes(await readHierarchy());
     }
     async function pressKey(direction) {
       await adbShell(serial, `input keyevent ${KEYEVENTS[direction]}`, { timeoutMs: 1e4 });
@@ -140085,8 +140119,8 @@ init_device_info();
 var sleep2 = (ms) => new Promise((r) => setTimeout(r, ms));
 var zodSchema17 = external_exports.object({
   udid: external_exports.string().describe("Target device id from `list-devices` (iOS UDID, Android serial, or Chromium id)."),
-  x: external_exports.number().describe("Normalized horizontal position 0.0\u20131.0 (left=0, right=1), not pixels"),
-  y: external_exports.number().describe("Normalized vertical position 0.0\u20131.0 (top=0, bottom=1), not pixels"),
+  x: external_exports.number().min(0).max(1).describe("Normalized horizontal position 0.0\u20131.0 (left=0, right=1), not pixels"),
+  y: external_exports.number().min(0).max(1).describe("Normalized vertical position 0.0\u20131.0 (top=0, bottom=1), not pixels"),
   clickCount: external_exports.number().int().min(1).max(10).optional().describe(
     "Number of taps/clicks dispatched as ONE multi-tap gesture (2 = double-tap / double-click). The taps land inside the OS double-tap window; on Chromium each click carries an escalating CDP clickCount so dblclick actually fires; on physical iOS 2 is the native double-tap and higher counts land as separate taps. Default 1."
   )
@@ -140200,10 +140234,10 @@ var MOMENTUM_FREE_MIN_DURATION_MS = 150;
 var MAX_DURATION_MS = 1e4;
 var zodSchema18 = external_exports.object({
   udid: external_exports.string().describe("Target device id from `list-devices` (iOS UDID or Android serial)."),
-  fromX: external_exports.number().describe("Start x: normalized 0.0\u20131.0 (not pixels; same as tap)"),
-  fromY: external_exports.number().describe("Start y: normalized 0.0\u20131.0 (not pixels; same as tap)"),
-  toX: external_exports.number().describe("End x: normalized 0.0\u20131.0 (not pixels; same as tap)"),
-  toY: external_exports.number().describe("End y: normalized 0.0\u20131.0 (not pixels; same as tap)"),
+  fromX: external_exports.number().min(0).max(1).describe("Start x: normalized 0.0\u20131.0 (not pixels; same as tap)"),
+  fromY: external_exports.number().min(0).max(1).describe("Start y: normalized 0.0\u20131.0 (not pixels; same as tap)"),
+  toX: external_exports.number().min(0).max(1).describe("End x: normalized 0.0\u20131.0 (not pixels; same as tap)"),
+  toY: external_exports.number().min(0).max(1).describe("End y: normalized 0.0\u20131.0 (not pixels; same as tap)"),
   durationMs: external_exports.number().max(MAX_DURATION_MS, {
     message: `durationMs must be at most ${MAX_DURATION_MS} (10s): every frame is a real 16ms sleep with the finger held down, so a larger value is that many milliseconds of wall clock spent holding a touch the device cannot shake off.`
   }).optional().describe(
@@ -140346,10 +140380,10 @@ init_device_info();
 var sleep4 = (ms) => new Promise((r) => setTimeout(r, ms));
 var zodSchema19 = external_exports.object({
   udid: external_exports.string().describe("Target Chromium device id from `list-devices` (chromium-cdp-<port>)."),
-  x: external_exports.number().describe(
+  x: external_exports.number().min(0).max(1).describe(
     "Anchor x: normalized 0.0\u20131.0 (fraction of window width, not pixels). The wheel events land here; put it over the element you want to scroll."
   ),
-  y: external_exports.number().describe("Anchor y: normalized 0.0\u20131.0 (fraction of window height, not pixels)."),
+  y: external_exports.number().min(0).max(1).describe("Anchor y: normalized 0.0\u20131.0 (fraction of window height, not pixels)."),
   deltaX: external_exports.number().optional().describe(
     "Horizontal scroll distance as a fraction of the window width (e.g. 0.5 = half a window). Positive scrolls content right (reveals content to the right)."
   ),
@@ -140415,10 +140449,10 @@ var MOMENTUM_FREE_MIN_STEPS = 8;
 var MAX_DURATION_MS2 = 1e4;
 var zodSchema20 = external_exports.object({
   udid: external_exports.string().describe("Target Chromium device id from `list-devices` (chromium-cdp-<port>)."),
-  fromX: external_exports.number().describe("Press x: normalized 0.0\u20131.0 (fraction of window width, not pixels)."),
-  fromY: external_exports.number().describe("Press y: normalized 0.0\u20131.0 (fraction of window height, not pixels)."),
-  toX: external_exports.number().describe("Release x: normalized 0.0\u20131.0 (not pixels; same space as tap)."),
-  toY: external_exports.number().describe("Release y: normalized 0.0\u20131.0 (not pixels; same space as tap)."),
+  fromX: external_exports.number().min(0).max(1).describe("Press x: normalized 0.0\u20131.0 (fraction of window width, not pixels)."),
+  fromY: external_exports.number().min(0).max(1).describe("Press y: normalized 0.0\u20131.0 (fraction of window height, not pixels)."),
+  toX: external_exports.number().min(0).max(1).describe("Release x: normalized 0.0\u20131.0 (not pixels; same space as tap)."),
+  toY: external_exports.number().min(0).max(1).describe("Release y: normalized 0.0\u20131.0 (not pixels; same space as tap)."),
   durationMs: external_exports.number().max(MAX_DURATION_MS2, {
     message: `durationMs must be at most ${MAX_DURATION_MS2} (10s): the drag holds the left button down for exactly this long, one frame per ~16ms, so a larger value is that much wall clock spent mid-press.`
   }).optional().describe(
@@ -141261,12 +141295,12 @@ async function typeSimulatorServer(registry2, device, params) {
 
 // ../tool-server/src/tools/tv/tv-service.ts
 init_device_info();
-function tvServiceRef(udid) {
+function tvServiceRef(udid, registry2) {
   const device = resolveDevice(udid);
-  return device.platform === "android" ? androidTvControlRef(device) : tvControlRef(device);
+  return device.platform === "android" ? androidTvControlRef(device, registry2) : tvControlRef(device);
 }
 async function resolveTvApi(registry2, udid) {
-  const ref = tvServiceRef(udid);
+  const ref = tvServiceRef(udid, registry2);
   return typeof ref === "string" ? registry2.resolveService(ref) : registry2.resolveService(ref.urn, ref.options);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/argent",
-  "version": "0.30.0",
+  "version": "0.30.1-next.1",
   "mcpName": "io.github.software-mansion/argent",
   "description": "MCP server for iOS Simulator and Android Emulator control",
   "license": "Apache-2.0",