@swmansion/argent 0.29.1-next.22 → 0.29.1-next.23

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.29.1-next.22";
+    return "0.29.1-next.23";
   }
   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.29.1-next.22";
+    return "0.29.1-next.23";
   }
   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.29.1-next.22";
+    return "0.29.1-next.23";
   }
   return "0.0.0";
 }
@@ -134819,7 +134819,7 @@ var NETWORK_INTERCEPTOR_SCRIPT = `(function() {
         if (outcome === 'error') {
           var text = '';
           try { if (xhr.responseType === '' || xhr.responseType === 'text') text = xhr.responseText; } catch (e) {}
-          return fail(rec, text ? String(text) : 'Network error');
+          return fail(rec, text ? String(text) : 'Network request failed');
         }
         // RN sets responseURL only after it announces HEADERS_RECEIVED: this is the final URL.
         if (rec.entry.response && xhr.responseURL) rec.entry.response.url = xhr.responseURL;
@@ -142414,18 +142414,19 @@ function parseDeviceStates(stdout) {
 function parseSnapshot(stdout) {
   const screenOn = !/mScreenOnFully=false/.test(stdout);
   const wakefulness = /mWakefulness=([A-Za-z]+)/.exec(stdout)?.[1];
+  const keyguard = /isKeyguardShowing=([a-z]+)/.exec(stdout)?.[1];
   return {
     state: /^\s*(\d+)\s*$/m.exec(stdout)?.[1],
     screenOn,
     awake: wakefulness ? !/^(Asleep|Dozing)$/.test(wakefulness) : screenOn,
-    keyguard: /isKeyguardShowing=true/.test(stdout)
+    keyguard: keyguard === void 0 ? void 0 : keyguard === "true"
   };
 }
 async function readSnapshot(serial) {
   return parseSnapshot(
     await shell(
       serial,
-      "cmd device_state print-state; dumpsys window displays | grep -o 'mScreenOnFully=[a-z]*'; dumpsys power | grep -o 'mWakefulness=[A-Za-z]*'; dumpsys window | grep -o 'isKeyguardShowing=[a-z]*'"
+      "cmd device_state print-state; dumpsys window displays | grep -o 'mScreenOnFully=[a-z]*'; dumpsys power | grep -o 'mWakefulness=[A-Za-z]*'; dumpsys window | grep -o 'isKeyguardShowing=[a-z]*'; true"
     )
   );
 }
@@ -142461,12 +142462,16 @@ async function dismissFoldLockScreen(serial, signal) {
   let lastAttempt = -Infinity;
   const deadline = Date.now() + DISMISS_TIMEOUT_MS;
   for (; ; ) {
-    if (!(await readSnapshot(serial)).keyguard) {
+    const { keyguard } = await readSnapshot(serial);
+    if (keyguard === false) {
       if (++clear >= STABLE_READS) return void 0;
     } else {
       clear = 0;
-      if (Date.now() >= deadline) break;
-      if (attempts < MAX_DISMISS_ATTEMPTS && Date.now() - lastAttempt >= DISMISS_SPACING_MS) {
+      if (Date.now() >= deadline) {
+        if (keyguard) break;
+        return void 0;
+      }
+      if (keyguard && attempts < MAX_DISMISS_ATTEMPTS && Date.now() - lastAttempt >= DISMISS_SPACING_MS) {
         attempts++;
         lastAttempt = Date.now();
         await shell(serial, "wm dismiss-keyguard");
@@ -142542,9 +142547,15 @@ async function fold(serial, params, device, signal) {
   const stateName = last?.state !== void 0 ? byId.get(last.state) ?? last.state : "unknown";
   const darkAwake = last?.state !== void 0 && last.awake && !last.screenOn;
   const budget = `${SETTLE_TIMEOUT_MS2 / 1e3} s`;
+  let lockScreen = last?.keyguard ?? false;
+  let lockScreenWarning;
+  if (stateName === "CLOSED" && !before.keyguard && last?.awake) {
+    lockScreen = false;
+    lockScreenWarning = await dismissFoldLockScreen(serial, signal);
+  }
   if (!settled && expected !== void 0) {
     throw failed(
-      last?.state === expected ? `${serial} reached device state ${stateName} for the ${params.posture} posture, but the device is awake and the screen did not stay on within ${budget}. Take a screenshot before the next action.` : `${serial} did not reach the ${params.posture} posture: the guest still reports device state ${stateName}. Fold again; a screenshot shows what the device renders.`,
+      last?.state === expected ? `${serial} reached device state ${stateName} for the ${params.posture} posture, but the device is awake and the screen did not stay on within ${budget}. Take a screenshot before the next action.` + (lockScreenWarning ? ` ${lockScreenWarning}` : "") : `${serial} did not reach the ${params.posture} posture: the guest still reports device state ${stateName}. Fold again; a screenshot shows what the device renders.`,
       "android_fold_unverified"
     );
   }
@@ -142558,12 +142569,7 @@ async function fold(serial, params, device, signal) {
       `The screen did not hold steady within ${budget}. Take a screenshot before the next action.`
     );
   }
-  let lockScreen = last?.keyguard ?? false;
-  if (stateName === "CLOSED" && !before.keyguard && last?.awake) {
-    lockScreen = false;
-    const warning = await dismissFoldLockScreen(serial, signal);
-    if (warning) warnings.push(warning);
-  }
+  if (lockScreenWarning) warnings.push(lockScreenWarning);
   const screenOff = settled && last !== void 0 && !last.screenOn;
   if (screenOff && lockScreen) {
     warnings.push(

package/package.json

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