@swmansion/argent 0.30.2-next.16 → 0.30.2-next.18

package/dist/cli-cmds.mjs

@@ -35594,7 +35594,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.30.2-next.15";
+    return "0.30.2-next.18";
   }
   return "0.0.0";
 }

package/dist/installer.mjs

@@ -16900,7 +16900,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.30.2-next.15";
+    return "0.30.2-next.18";
   }
   return "0.0.0";
 }

package/dist/tool-server.cjs

@@ -100945,7 +100945,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.2-next.15";
+    return "0.30.2-next.18";
   }
   return "0.0.0";
 }
@@ -137870,9 +137870,12 @@ var BOOT_POLL_INTERVALS_MS = {
   // findSerialByAvdName: re-scan when >1 new emulator appeared
   adbRegister: 1e3,
   // attemptBoot stage 2: re-scan adb devices for the new serial
-  earlyExit: 500
+  earlyExit: 500,
   // createEarlyExitRacer: re-check the crash latch during a blocking adb call
+  serialGone: 500
+  // awaitEmulatorsGone: re-scan adb devices for a killed emulator
 };
+var EMULATOR_GONE_BUDGET_MS = 3e4;
 var FRAME_PROBE = "screencap -p 2>/dev/null | wc -c | awk '$1>20000{print 1;exit} {print 0}'";
 async function killEmulatorQuietly(serial, child) {
   if (serial) {
@@ -137952,18 +137955,28 @@ async function findSerialByAvdName(avdName, deadline) {
   }
   return null;
 }
-async function listNewEmulatorSerials(before) {
+async function listEmulatorSerials() {
   const { stdout } = await runAdb(["devices"], { timeoutMs: 3e3 }).catch(() => ({
     stdout: "",
     stderr: ""
   }));
-  const lines = stdout.split("\n");
   const now = [];
-  for (const line of lines) {
+  for (const line of stdout.split("\n")) {
     const m = line.match(/^(emulator-\d+)\s+/);
     if (m) now.push(m[1]);
   }
-  return now.filter((s) => !before.has(s));
+  return now;
+}
+async function listNewEmulatorSerials(before) {
+  return (await listEmulatorSerials()).filter((s) => !before.has(s));
+}
+async function awaitEmulatorsGone(serials) {
+  const deadline = Date.now() + EMULATOR_GONE_BUDGET_MS;
+  while (serials.length > 0 && Date.now() < deadline) {
+    const listed = await listEmulatorSerials();
+    if (!serials.some((s) => listed.includes(s))) return;
+    await new Promise((r) => setTimeout(r, BOOT_POLL_INTERVALS_MS.serialGone));
+  }
 }
 async function bootIos(udid, registry2, force, headless) {
   if (process.platform !== "darwin") {
@@ -138312,14 +138325,18 @@ async function bootAndroidImpl(params) {
   });
   const existingDevices = await listAndroidDevices().catch(() => []);
   let hotBootFailureReason;
+  const dropKilledEmulator = async (serial) => {
+    await awaitEmulatorsGone([serial]);
+    const refreshed = await listAndroidDevices().catch(() => existingDevices);
+    existingDevices.splice(0, existingDevices.length, ...refreshed);
+  };
   const alreadyRunning = existingDevices.find(
     (d) => d.isEmulator && d.avdName === params.avdName && d.state === "device"
   );
   if (alreadyRunning) {
     if (params.force) {
       await killEmulatorQuietly(alreadyRunning.serial);
-      const refreshed = await listAndroidDevices().catch(() => existingDevices);
-      existingDevices.splice(0, existingDevices.length, ...refreshed);
+      await dropKilledEmulator(alreadyRunning.serial);
     } else {
       try {
         await assertScreencapAlive(alreadyRunning.serial);
@@ -138330,8 +138347,7 @@ async function bootAndroidImpl(params) {
           booted: true
         };
       } catch (_err) {
-        const refreshed = await listAndroidDevices().catch(() => existingDevices);
-        existingDevices.splice(0, existingDevices.length, ...refreshed);
+        await dropKilledEmulator(alreadyRunning.serial);
       }
     }
   }
@@ -138384,6 +138400,7 @@ async function bootAndroidImpl(params) {
         };
       } catch (err) {
         hotBootFailureReason = err instanceof Error ? err.message : String(err);
+        await awaitEmulatorsGone(await listNewEmulatorSerials(serialsBefore));
         const refreshed = new Set(
           (await listAndroidDevices().catch(() => [])).map((d) => d.serial)
         );

package/package.json

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