@swmansion/argent 0.26.1-next.8 → 0.26.1-next.9

package/dist/cli-cmds.mjs

@@ -21877,7 +21877,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.26.1-next.8";
+    return "0.26.1-next.9";
   }
   return "0.0.0";
 }
@@ -23416,7 +23416,7 @@ function renderFailedFlows(failed) {
 var SAFE_ARTIFACT_NAME = FLOW_NAME_PATTERN;
 var SAFE_FLOW_NAME = FLOW_NAME_PATTERN;
 var FLOWS_DIR = path14.join(".argent", "flows");
-var SHELL_SAFE_ARG = /^[A-Za-z0-9_@%+=:,./-]+$/;
+var SHELL_SAFE_ARG = /^(?!=)[A-Za-z0-9_@%+=:,./-]+$/;
 function shellQuoteArg(arg) {
   if (SHELL_SAFE_ARG.test(arg)) return arg;
   return `'${arg.replaceAll("'", "'\\''")}'`;

package/dist/installer.mjs

@@ -16730,7 +16730,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.26.1-next.8";
+    return "0.26.1-next.9";
   }
   return "0.0.0";
 }

package/dist/tool-server.cjs

@@ -73390,6 +73390,9 @@ function resolveDevice(udid) {
 function isIosPhysicalDevice(device) {
   return device.platform === "ios" && device.kind === "device";
 }
+function isIosSimulator(device) {
+  return device.platform === "ios" && device.kind === "simulator" || device.platform === "ios-remote";
+}
 function parseChromiumCdpPort(udid) {
   if (!udid.startsWith(CHROMIUM_ID_PREFIX)) return null;
   const tail = udid.slice(CHROMIUM_ID_PREFIX.length);
@@ -94811,7 +94814,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.26.1-next.8";
+    return "0.26.1-next.9";
   }
   return "0.0.0";
 }
@@ -96626,6 +96629,7 @@ var path11 = __toESM(require("node:path"));
 var import_node_child_process7 = require("node:child_process");
 var import_node_util6 = require("node:util");
 init_external_devices();
+init_device_info();
 var execFileAsync6 = (0, import_node_util6.promisify)(import_node_child_process7.execFile);
 async function listDeviceSetSimulators(deviceSet) {
   if (deviceSet && !fs12.existsSync(deviceSet)) return [];
@@ -96686,11 +96690,15 @@ var runtimeKindCache = /* @__PURE__ */ new Map();
 async function getSimulatorRuntimeKind(udid) {
   const cached3 = runtimeKindCache.get(udid);
   if (cached3) return cached3;
-  const listing = isExternalId(udid) ? await listDeviceSetSimulators(await deviceSetForUdid(udid)) : await listIosSimulators();
-  const kind = listing.find((s) => s.udid === externalNativeId(udid))?.runtimeKind;
+  const kind = (await findIosSimulator(udid))?.runtimeKind;
   if (kind) runtimeKindCache.set(udid, kind);
   return kind;
 }
+async function findIosSimulator(udid) {
+  const listing = isExternalId(udid) ? await listDeviceSetSimulators(await deviceSetForUdid(udid)) : await listIosSimulators();
+  const native = externalNativeId(udid);
+  return listing.find((s) => s.udid === native);
+}
 async function isTvOsSimulator(udid) {
   return await getSimulatorRuntimeKind(udid) === "tv";
 }
@@ -96754,11 +96762,11 @@ async function isFoldableDeviceType(identifier) {
   return foldable;
 }
 async function isFoldableSimulator(udid) {
+  const device = resolveDevice(udid);
+  if (device.platform !== "ios" || device.kind !== "simulator") return false;
   const cached3 = foldableCache.get(udid);
   if (cached3 !== void 0) return cached3;
-  const listing = isExternalId(udid) ? await listDeviceSetSimulators(await deviceSetForUdid(udid)) : await listIosSimulators();
-  const native = externalNativeId(udid);
-  const found = listing.find((s) => s.udid === native);
+  const found = await findIosSimulator(udid);
   const foldable = found?.foldable === true;
   if (found) foldableCache.set(udid, foldable);
   return foldable;
@@ -134469,22 +134477,36 @@ function buildTextTree(data, opts) {
     }
   }
   const lines = [];
-  const turn = opts.uiOrientation && opts.uiOrientation !== "unknown" && opts.uiOrientation !== "ambiguous" ? opts.uiOrientation : void 0;
+  const turn = opts.uiOrientation && opts.uiOrientation !== "unknown" && opts.uiOrientation !== "ambiguous" && opts.uiOrientation !== "mismatched" ? opts.uiOrientation : void 0;
   if (canNormalize) {
     lines.push(`Screen: ${screenW}x${screenH}`);
-    if (turn && turn !== "portrait") {
+    if (opts.uiOrientation === "mismatched") {
+      lines.push(
+        "Note: The udid is not the UDID of the simulator that shows this app. Thus, the tool did not use the udid. If the UI is landscape, the tap points are not correct. The describe tool gives correct tap points. This tool also gives correct tap points with the UDID of the simulator that shows this app."
+      );
+    } else if (turn && turn !== "portrait") {
       lines.push(
         `The UI is ${turn} on the screen. The tap points are on the screen's axes, which the gesture tools use.`
       );
     } else if (opts.uiOrientation === "ambiguous" && screenW > screenH) {
       lines.push(
-        "Note: the UI is landscape, and two booted simulators have this device's name, so its orientation could not be read. The tap points are on the UI's axes, so a tap can miss. Call again with the simulator's udid, or use describe for tap points."
+        "Note: the UI is landscape, and two booted simulators have this device's name, so its orientation could not be read. The tap points are on the UI's axes, so a tap can miss. Use describe for tap points, or call again with the udid of the simulator that shows this app."
       );
     } else if (opts.uiOrientation === "unknown" && screenW > screenH) {
       lines.push(
         "Note: the UI is landscape, and its orientation could not be read. The tap points are on the UI's axes, so a tap can miss. Use describe for tap points."
       );
     }
+    if (opts.readInsteadOfUdid) {
+      lines.push(
+        `Note: the udid is not the UDID of the simulator that shows this app. The tool used ${opts.readInsteadOfUdid}, the UDID of that simulator.`
+      );
+    }
+    if (opts.udidUnchecked && (screenW > screenH || turn !== void 0 && turn !== "portrait")) {
+      lines.push(
+        "Note: two booted simulators have this device's name, so the tool could not check that the udid is the simulator that shows this app. If it is another simulator, a tap can miss. Use describe for tap points."
+      );
+    }
     lines.push("");
   }
   function formatLabel2(c) {
@@ -134588,14 +134610,57 @@ async function debuggedBundleId(api, appName) {
 }
 var BUNDLE_ID_NAMED_TARGET = /^[\w-]+(\.[\w-]+)+( \(|$)/;
 var AMBIGUOUS_SIMULATOR = "ambiguous-simulator";
-function isIosSimulator(device) {
-  return device.platform === "ios" && device.kind === "simulator" || device.platform === "ios-remote";
-}
+var MISMATCHED_UDID = "mismatched-udid";
+var UNLISTED_UDID = "unlisted-udid";
 async function iosSimulatorOf(app) {
-  if (app.udid) {
-    const named2 = resolveDevice(app.udid);
-    return isIosSimulator(named2) ? named2 : void 0;
+  if (!app.udid) {
+    const session2 = await iosSimulatorOfSession(app);
+    return session2 === AMBIGUOUS_SIMULATOR || !session2 ? session2 : { device: session2 };
+  }
+  const named = resolveDevice(app.udid);
+  const own = resolveDevice(canonicalDeviceId(app.deviceId) ?? app.deviceId);
+  if (isIosSimulator(own)) {
+    if (own.id === named.id) return { device: own };
+    if (isIosSimulator(named)) {
+      const [listed2, ownListed] = await Promise.all([
+        listedAs(named, app.deviceName),
+        listedAs(own, app.deviceName)
+      ]);
+      if (listed2 === "booted" && ownListed !== "booted") return { device: named };
+    }
+    return { device: own, readInsteadOfUdid: own.id };
   }
+  const [listed, session] = await Promise.all([
+    isIosSimulator(named) ? listedAs(named, app.deviceName) : void 0,
+    iosSimulatorOfSession(app)
+  ]);
+  if (listed === "booted" || listed === "twin") {
+    const sole = session === void 0 || session !== AMBIGUOUS_SIMULATOR && session.id === named.id;
+    return listed === "booted" && sole ? { device: named } : { device: named, udidUnchecked: true };
+  }
+  if (session === AMBIGUOUS_SIMULATOR) return MISMATCHED_UDID;
+  if (session) {
+    return session.id === named.id ? { device: session } : { device: session, readInsteadOfUdid: session.id };
+  }
+  return listed === "unlisted" ? UNLISTED_UDID : void 0;
+}
+async function listedAs(device, name) {
+  if (device.platform !== "ios-remote") {
+    const sim2 = await findIosSimulator(device.id);
+    if (!sim2) return "unlisted";
+    return sim2.state === "Booted" && sim2.name === name ? "booted" : "other";
+  }
+  const listing = Object.values(
+    (await simctlListDevices({ timeoutMs: ORIENTATION_READ_TIMEOUT_MS }).catch(() => ({
+      devices: {}
+    }))).devices
+  ).flat();
+  const sim = listing.find((d) => d.udid === stripRemotePrefix(device.id));
+  if (!sim) return "unlisted";
+  if (sim.state !== "Booted" || sim.name !== name) return "other";
+  return listing.some((d) => d !== sim && d.state === "Booted" && d.name === name) ? "twin" : "booted";
+}
+async function iosSimulatorOfSession(app) {
   const device = resolveDevice(canonicalDeviceId(app.deviceId) ?? app.deviceId);
   if (isIosSimulator(device)) return device;
   const logicalKeyed = app.deviceId === app.logicalDeviceId || isLogicalKeyedDevice(app.deviceId);
@@ -134608,22 +134673,28 @@ async function iosSimulatorOf(app) {
 }
 async function readTapAxes(registry2, app) {
   const read = (async () => {
-    const device = await iosSimulatorOf(app);
-    if (device === void 0) return void 0;
-    if (device === AMBIGUOUS_SIMULATOR) return "ambiguous";
+    const pick2 = await iosSimulatorOf(app);
+    if (pick2 === void 0) return {};
+    if (pick2 === AMBIGUOUS_SIMULATOR) return { uiOrientation: "ambiguous" };
+    if (pick2 === MISMATCHED_UDID) return { uiOrientation: "mismatched" };
+    if (pick2 === UNLISTED_UDID) return { uiOrientation: "unknown" };
+    const { device, ...udid } = pick2;
     const ref = nativeDevtoolsRef(device);
     const api = await registry2.resolveService(ref.urn, ref.options);
     const bundleId = await debuggedBundleId(api, app.appName);
-    if (!bundleId) return "unknown";
+    if (!bundleId) return { uiOrientation: "unknown", ...udid };
     const raw = await api.queryViewHierarchy(bundleId, "ViewHierarchy.getFullHierarchy", {
       fields: ["className"],
       maxDepth: 1
     });
-    return asUiOrientation(raw?.screen?.interfaceOrientation) ?? "unknown";
-  })().catch(() => "unknown");
+    return {
+      uiOrientation: asUiOrientation(raw?.screen?.interfaceOrientation) ?? "unknown",
+      ...udid
+    };
+  })().catch(() => ({ uiOrientation: "unknown" }));
   let timer;
   const timeout = new Promise((resolve14) => {
-    timer = setTimeout(() => resolve14("unknown"), ORIENTATION_READ_TIMEOUT_MS);
+    timer = setTimeout(() => resolve14({ uiOrientation: "unknown" }), ORIENTATION_READ_TIMEOUT_MS);
   });
   try {
     return await Promise.race([read, timeout]);
@@ -134637,7 +134708,7 @@ var zodSchema34 = external_exports.object({
     "Device id from list-devices \u2014 the SAME id you passed to debugger-connect (iOS simulator UDID or Android serial)."
   ),
   udid: external_exports.string().optional().describe(
-    "iOS simulator UDID from list-devices. Pass it when device_id is a logicalDeviceId (two or more devices share one Metro), so that the tap coordinates of a landscape UI are on the screen's axes."
+    "iOS simulator UDID from list-devices. Pass it when device_id is a logicalDeviceId (two or more devices share one Metro), so that the tap coordinates of a landscape UI are on the screen's axes. Give the UDID of the simulator that shows the app."
   ),
   onScreenOnly: external_exports.boolean().default(true).describe(
     "When true (default), only components visible on screen are returned. Set to false to include all mounted components including those scrolled off-screen. Useful when you need to understand the full page structure."
@@ -134716,7 +134787,7 @@ Use when you need tap coordinates for a React Native UI element. Returns a compa
         onScreenOnly: params.onScreenOnly,
         maxNodes: params.maxNodes,
         includeSkipped: params.includeSkipped,
-        uiOrientation: await tapAxes
+        ...await tapAxes
       });
       const deviceLine = [
         `device: ${api.deviceName}`,
@@ -150259,7 +150330,7 @@ async function runSwipe(env, step) {
     toPoint = p;
   }
   const orientation = env.lastRead?.uiOrientation;
-  if (settle.warning !== void 0 && step.direction) {
+  if (settle.warning !== void 0 && step.direction && isIosSimulator(env.device)) {
     settle = { ...settle, warning: `${settle.warning} ${unreadOrientationNote(orientation)}` };
   }
   let start2;

package/package.json

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