@swmansion/argent 0.22.2-next.1 → 0.22.2-next.11

package/dist/tool-server.cjs

@@ -628,6 +628,9 @@ var init_failure_codes = __esm({
       SIMULATOR_SERVER_READY_TIMEOUT: "SIMULATOR_SERVER_READY_TIMEOUT",
       SIMULATOR_SERVER_PROCESS_ERROR: "SIMULATOR_SERVER_PROCESS_ERROR",
       SIMULATOR_SERVER_TERMINATED: "SIMULATOR_SERVER_TERMINATED",
+      SIMULATOR_COMMAND_REJECTED: "SIMULATOR_COMMAND_REJECTED",
+      SIMULATOR_COMMAND_ACK_TIMEOUT: "SIMULATOR_COMMAND_ACK_TIMEOUT",
+      SIMULATOR_COMMAND_TRANSPORT_FAILED: "SIMULATOR_COMMAND_TRANSPORT_FAILED",
       AX_QUERY_TIMEOUT: "AX_QUERY_TIMEOUT",
       AX_DAEMON_READY_TIMEOUT: "AX_DAEMON_READY_TIMEOUT",
       AX_DAEMON_EXITED_BEFORE_READY: "AX_DAEMON_EXITED_BEFORE_READY",
@@ -76339,15 +76342,28 @@ async function emulatorSupportsFlag(flag, options = {}) {
   const cached3 = emulatorFlagSupportCache.get(cacheKey3);
   if (cached3 !== void 0) return cached3;
   let output;
+  let failure = null;
   try {
     const { stdout, stderr } = await execFileAsync9(emulatorPath, ["-help"], {
       timeout: options.timeoutMs ?? 1e4,
+      // Same hazard runAdb guards against: a SIGTERM-immune child (emulator
+      // wedged in Qt/graphics init) leaves execFile unsettled forever, and
+      // this await has no deadline of its own.
+      killSignal: "SIGKILL",
       maxBuffer: 8 * 1024 * 1024
     });
     output = stdout + stderr;
   } catch (err) {
     const e = err;
-    output = (e.stdout ?? "") + (e.stderr ?? "");
+    output = e.killed ? "" : (e.stdout ?? "") + (e.stderr ?? "");
+    failure = err instanceof Error ? err.message : String(err);
+  }
+  if (output === "") {
+    process.stderr.write(
+      `[argent] \`${emulatorPath} -help\` produced no complete listing ` + (failure ? `(${failure})` : "but exited successfully") + `; assuming "${flag}" unsupported for this boot and retrying on the next one
+`
+    );
+    return false;
   }
   const supported = output.includes(flag);
   emulatorFlagSupportCache.set(cacheKey3, supported);
@@ -76557,7 +76573,10 @@ async function listAvds() {
   const emulatorPath = await resolveAndroidBinary("emulator");
   if (!emulatorPath) return [];
   try {
-    const { stdout } = await execFileAsync9(emulatorPath, ["-list-avds"], { timeout: 5e3 });
+    const { stdout } = await execFileAsync9(emulatorPath, ["-list-avds"], {
+      timeout: 5e3,
+      killSignal: "SIGKILL"
+    });
     return stdout.split("\n").map((l) => l.trim()).filter((l) => l && AVD_NAME_PATTERN.test(l)).map((name) => ({ name }));
   } catch {
     return [];
@@ -76575,6 +76594,7 @@ async function checkSnapshotLoadable(avdName, snapshotName = "default_boot", opt
     ];
     const { stdout } = await execFileAsync9(emulatorPath, args, {
       timeout: options.timeoutMs ?? 1e4,
+      killSignal: "SIGKILL",
       maxBuffer: 4 * 1024 * 1024
     });
     const tail = stdout.split("\n").slice(-6).join("\n");
@@ -89978,6 +89998,10 @@ var FLAG_REGISTRY = [
     name: "disable-auto-screenshot",
     description: "Disable the automatic screenshot captured after interaction tools."
   },
+  {
+    name: "disable-auto-describe",
+    description: "Disable the accessibility element tree appended after interaction tools."
+  },
   {
     name: "argent-lens",
     description: "Argent Lens \u2014 the propose_variant / await_user_selection tools and the Electron preview window for staging UI design variants and letting a human pick among them. Off by default while the feature is in development."
@@ -90278,6 +90302,14 @@ var CONFIG_SCHEMA = [
     // drained/reset, not just the file rewritten.
     manageCommand: "argent telemetry"
   },
+  {
+    key: "allowlist.enabled",
+    description: "Whether `argent update` re-applies editor auto-approve allowlist rules. Unset (the default) keeps the current behavior: update refreshes the rules for editors that already have argent configured. Set to `false` to keep update from touching editor allowlists. `false` in either scope wins, so a committed project opt-out holds for every teammate.",
+    scopes: ["project", "global"],
+    parse: asBoolean,
+    merge: "prioritize-restrictive",
+    example: "false"
+  },
   {
     key: "lens.agent",
     description: "Coding-agent id remembered by `argent lens` to skip the picker.",
@@ -93869,7 +93901,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.22.2-next.1";
+    return "0.22.2-next.11";
   }
   return "0.0.0";
 }
@@ -94237,7 +94269,10 @@ function simulatorServerBinaryPath() {
   }
   return p;
 }
-function simulatorServerBinaryDir() {
+function simulatorServerRunDir() {
+  if (fs7.existsSync(path8.join(BIN_DIR, "resources", "android"))) {
+    return BIN_DIR;
+  }
   return platformBinDir();
 }
 function requireBinIn(dir, name) {
@@ -95217,7 +95252,7 @@ var import_node_path5 = __toESM(require("node:path"));
 var import_semver2 = __toESM(require_semver2());
 
 // ../tool-server/package.json
-var version2 = "0.22.1";
+var version2 = "0.23.0";
 
 // ../tool-server/src/utils/update-checker.ts
 var import_update_core = __toESM(require_dist4());
@@ -95381,13 +95416,56 @@ var import_express = __toESM(require_express2());
 
 // ../tool-server/src/blueprints/simulator-server.ts
 var import_node_child_process10 = require("node:child_process");
-var readline2 = __toESM(require("node:readline"));
+var readline = __toESM(require("node:readline"));
 init_src();
 
 // ../tool-server/src/blueprints/ax-service.ts
 var net = __toESM(require("node:net"));
 var fs13 = __toESM(require("node:fs"));
-var readline = __toESM(require("node:readline"));
+
+// ../tool-server/src/utils/ndjson-socket.ts
+var PREVIEW_CHARS = 80;
+function preview(raw) {
+  const printable = raw.replace(/[\x00-\x1f\x7f\u2028\u2029]/g, "\xB7");
+  return printable.length > PREVIEW_CHARS ? `${printable.slice(0, PREVIEW_CHARS)}\u2026` : printable;
+}
+function reportDroppedFrameToStderr(tag3) {
+  return ({ bytes, preview: preview2 }) => {
+    process.stderr.write(`[${tag3}] dropped unparseable frame (${bytes} bytes): ${preview2}
+`);
+  };
+}
+function attachNdjsonReader(socket, handlers) {
+  socket.setEncoding("utf8");
+  let buf = "";
+  const deliver = (raw) => {
+    if (raw.length === 0 || raw === "\r") return;
+    let msg;
+    try {
+      msg = JSON.parse(raw);
+    } catch {
+      handlers.onDropped({ bytes: Buffer.byteLength(raw, "utf8"), preview: preview(raw) });
+      return;
+    }
+    handlers.onMessage(msg);
+  };
+  socket.on("data", (chunk) => {
+    buf += typeof chunk === "string" ? chunk : chunk.toString("utf8");
+    let nl;
+    while ((nl = buf.indexOf("\n")) !== -1) {
+      const raw = buf.slice(0, nl);
+      buf = buf.slice(nl + 1);
+      deliver(raw);
+    }
+  });
+  socket.on("end", () => {
+    const rest = buf;
+    buf = "";
+    if (rest.length > 0) deliver(rest);
+  });
+}
+
+// ../tool-server/src/blueprints/ax-service.ts
 init_src();
 
 // ../tool-server/src/utils/ios-host.ts
@@ -95686,9 +95764,8 @@ async function simctlShutdown(udid) {
   await run(["simctl", "shutdown", stripRemotePrefix(udid)]);
 }
 async function simctlBootstatus(udid, opts) {
-  const args = ["simctl", "bootstatus"];
+  const args = ["simctl", "bootstatus", stripRemotePrefix(udid)];
   if (opts?.boot) args.push("-b");
-  args.push(stripRemotePrefix(udid));
   await run(args, { timeoutMs: 5 * 6e4 });
 }
 async function simctlLaunch(udid, bundleId, args = []) {
@@ -96223,37 +96300,33 @@ var axServiceBlueprint = {
         daemonSocket.destroy();
       }
       daemonSocket = socket;
-      const rl = readline.createInterface({ input: socket });
-      rl.on("line", (raw) => {
-        let msg;
-        try {
-          msg = JSON.parse(raw);
-        } catch {
-          return;
-        }
-        if (typeof msg.id !== "number") return;
-        const pending = pendingRpc.get(msg.id);
-        if (!pending) return;
-        pendingRpc.delete(msg.id);
-        clearTimeout(pending.timer);
-        if (msg.error !== void 0 && msg.error !== null) {
-          pending.reject(
-            new FailureError(
-              typeof msg.error === "string" ? msg.error : JSON.stringify(msg.error),
-              {
-                error_code: FAILURE_CODES.AX_QUERY_FAILED,
-                failure_stage: "ax_service_query_rpc",
-                failure_area: "tool_server",
-                error_kind: "unknown"
-              }
-            )
-          );
-        } else {
-          pending.resolve(msg.result);
+      attachNdjsonReader(socket, {
+        onDropped: reportDroppedFrameToStderr(`ax-service ${udid.slice(0, 8)}`),
+        onMessage: (parsed) => {
+          const msg = parsed;
+          if (typeof msg.id !== "number") return;
+          const pending = pendingRpc.get(msg.id);
+          if (!pending) return;
+          pendingRpc.delete(msg.id);
+          clearTimeout(pending.timer);
+          if (msg.error !== void 0 && msg.error !== null) {
+            pending.reject(
+              new FailureError(
+                typeof msg.error === "string" ? msg.error : JSON.stringify(msg.error),
+                {
+                  error_code: FAILURE_CODES.AX_QUERY_FAILED,
+                  failure_stage: "ax_service_query_rpc",
+                  failure_area: "tool_server",
+                  error_kind: "unknown"
+                }
+              )
+            );
+          } else {
+            pending.resolve(msg.result);
+          }
         }
       });
       socket.on("close", () => {
-        rl.close();
         if (daemonSocket === socket) {
           daemonSocket = null;
           if (!disposed) {
@@ -106263,33 +106336,127 @@ var DEFAULT_SCREENSHOT_SCALE = 0.25;
 var NO_IMAGE_ERROR = /no image to export/i;
 var FIRST_FRAME_WAIT_MS = 6e3;
 var FIRST_FRAME_POLL_MS = 250;
+var COMMAND_ACK_TIMEOUT_MS = 5e3;
 var connections = /* @__PURE__ */ new Map();
 var cmdId = 0;
-function getOrCreateWs(api) {
+function failAllPending(conn, makeError) {
+  const entries = [...conn.pending.values()];
+  conn.pending.clear();
+  for (const entry of entries) entry.settle(makeError(entry.cmd));
+}
+function transportError(cmd, apiUrl, detail) {
+  return new FailureError(
+    `simulator-server did not accept the '${cmd}' command: ${detail}. The command was NOT delivered to the device. Check that the simulator is still booted and the simulator-server for ${apiUrl} is running.`,
+    {
+      error_code: FAILURE_CODES.SIMULATOR_COMMAND_TRANSPORT_FAILED,
+      failure_stage: "simulator_command_transport",
+      failure_area: "tool_server",
+      error_kind: "network",
+      network_failure: "connection_reset",
+      failure_command: "simulator_server"
+    }
+  );
+}
+function getOrCreateConnection(api) {
   const key2 = api.apiUrl;
   const existing = connections.get(key2);
-  if (existing && (existing.readyState === wrapper_default.OPEN || existing.readyState === wrapper_default.CONNECTING)) {
+  if (existing && (existing.ws.readyState === wrapper_default.OPEN || existing.ws.readyState === wrapper_default.CONNECTING)) {
     return existing;
   }
   const { host } = new URL(api.apiUrl);
   const ws = new wrapper_default(`ws://${host}/ws`);
-  ws.on("error", () => connections.delete(key2));
-  ws.on("close", () => connections.delete(key2));
-  connections.set(key2, ws);
-  return ws;
+  const conn = { ws, pending: /* @__PURE__ */ new Map() };
+  ws.on("message", (data) => {
+    const text = Buffer.isBuffer(data) ? data.toString() : Array.isArray(data) ? Buffer.concat(data).toString() : Buffer.from(data).toString();
+    let ack;
+    try {
+      ack = JSON.parse(text);
+    } catch {
+      return;
+    }
+    if (ack.status !== "ok" && ack.status !== "error") return;
+    if (ack.id != null && !conn.pending.has(ack.id)) return;
+    const id = ack.id ?? conn.pending.keys().next().value;
+    if (id == null) return;
+    const entry = conn.pending.get(id);
+    if (entry == null) return;
+    conn.pending.delete(id);
+    if (ack.status === "ok") {
+      entry.settle();
+      return;
+    }
+    entry.settle(
+      new FailureError(
+        `simulator-server rejected the '${entry.cmd}' command: ${ack.message ?? "unknown error"}. The command was NOT delivered to the device.`,
+        {
+          error_code: FAILURE_CODES.SIMULATOR_COMMAND_REJECTED,
+          failure_stage: "simulator_command_rejected",
+          failure_area: "tool_server",
+          error_kind: "unknown",
+          failure_command: "simulator_server"
+        }
+      )
+    );
+  });
+  ws.on("error", (err) => {
+    connections.delete(key2);
+    failAllPending(conn, (cmd) => transportError(cmd, key2, err.message));
+  });
+  ws.on("close", () => {
+    connections.delete(key2);
+    failAllPending(conn, (cmd) => transportError(cmd, key2, "the connection closed"));
+  });
+  connections.set(key2, conn);
+  return conn;
 }
 function sendCommand(api, cmd) {
   if (api.transport) {
     routeViaTransport(api.transport, cmd);
-    return;
-  }
-  const ws = getOrCreateWs(api);
-  const payload = JSON.stringify({ id: String(++cmdId), ...cmd });
-  if (ws.readyState === wrapper_default.OPEN) {
-    ws.send(payload);
-  } else {
-    ws.once("open", () => ws.send(payload));
+    return Promise.resolve();
   }
+  const conn = getOrCreateConnection(api);
+  const id = String(++cmdId);
+  const cmdName = typeof cmd.cmd === "string" ? cmd.cmd : "unknown";
+  const payload = JSON.stringify({ id, ...cmd });
+  return new Promise((resolve12, reject) => {
+    let done = false;
+    const settle = (err) => {
+      if (done) return;
+      done = true;
+      clearTimeout(timer);
+      conn.pending.delete(id);
+      if (err) reject(err);
+      else resolve12();
+    };
+    const timer = setTimeout(
+      () => settleAndDropConnection(
+        new FailureError(
+          `simulator-server did not acknowledge the '${cmdName}' command within ${COMMAND_ACK_TIMEOUT_MS}ms. The command may not have reached the device \u2014 the simulator may be wedged or the simulator-server unresponsive.`,
+          {
+            error_code: FAILURE_CODES.SIMULATOR_COMMAND_ACK_TIMEOUT,
+            failure_stage: "simulator_command_ack",
+            failure_area: "tool_server",
+            error_kind: "timeout",
+            network_failure: "timeout",
+            failure_command: "simulator_server"
+          }
+        )
+      ),
+      COMMAND_ACK_TIMEOUT_MS
+    );
+    timer.unref?.();
+    const settleAndDropConnection = (err) => {
+      settle(err);
+      connections.delete(api.apiUrl);
+      conn.ws.close();
+    };
+    conn.pending.set(id, { settle, cmd: cmdName });
+    const write = () => conn.ws.send(payload, (err) => {
+      if (err) settle(transportError(cmdName, api.apiUrl, err.message));
+    });
+    if (conn.ws.readyState === wrapper_default.OPEN) write();
+    else conn.ws.once("open", write);
+  });
 }
 function setPointerVisible(api, show, signal) {
   return pointerPost(api, { show }, signal);
@@ -106517,8 +106684,8 @@ function simulatorServerRef(device) {
 }
 var getPaths = () => {
   const BINARY_PATH = simulatorServerBinaryPath();
-  const BINARY_DIR = simulatorServerBinaryDir();
-  return { BINARY_PATH, BINARY_DIR };
+  const RUN_DIR = simulatorServerRunDir();
+  return { BINARY_PATH, RUN_DIR };
 };
 var READY_TIMEOUT_MS = 3e4;
 async function buildRemoteInstance(device) {
@@ -106562,12 +106729,12 @@ async function spawnSimulatorServerProcess(udid, subcommand) {
     throw new Error(`Refusing to start simulator-server for unsafe device id "${udid}".`);
   }
   const deviceSet = subcommand === "ios" ? await deviceSetForUdid(udid) : null;
-  const { BINARY_PATH, BINARY_DIR } = getPaths();
+  const { BINARY_PATH, RUN_DIR } = getPaths();
   return new Promise((resolve12, reject) => {
     const args = [subcommand, "--id", udid];
     if (deviceSet) args.push("--device-set", deviceSet);
     const proc = (0, import_node_child_process10.spawn)(BINARY_PATH, args, {
-      cwd: BINARY_DIR,
+      cwd: RUN_DIR,
       stdio: ["pipe", "pipe", "pipe"]
     });
     let apiUrl = null;
@@ -106575,7 +106742,7 @@ async function spawnSimulatorServerProcess(udid, subcommand) {
     let settled = false;
     const STREAM_GRACE_MS = 500;
     let apiReadyTimer = null;
-    const rl = readline2.createInterface({ input: proc.stdout });
+    const rl = readline.createInterface({ input: proc.stdout });
     const settle = (fn, cleanup) => {
       if (settled) return;
       settled = true;
@@ -109223,7 +109390,6 @@ var variantProposalStore = new VariantProposalStore();
 // ../tool-server/src/blueprints/native-devtools.ts
 var net2 = __toESM(require("node:net"));
 var fs18 = __toESM(require("node:fs"));
-var readline3 = __toESM(require("node:readline"));
 init_src();
 var NATIVE_DEVTOOLS_NAMESPACE = "NativeDevtools";
 function isInjectableBundleId(bundleId) {
@@ -109490,67 +109656,63 @@ var nativeDevtoolsBlueprint = {
     }
     const server = net2.createServer((socket) => {
       let bundleId = null;
-      const rl = readline3.createInterface({ input: socket });
-      rl.on("line", (raw) => {
-        let msg;
-        try {
-          msg = JSON.parse(raw);
-        } catch {
-          return;
-        }
-        if (bundleId === null) {
-          if (msg.type !== "Control") return;
-          bundleId = msg.payload.bundleId;
-          const existing = connections2.get(bundleId);
-          if (existing) {
-            existing.socket.destroy();
-          }
-          connections2.set(bundleId, { socket, networkLog: [] });
-          if (activatedBundleIds.has(bundleId)) {
-            socket.write(
-              JSON.stringify({
-                type: "Control",
-                payload: { command: "activateNetworkInspection" }
-              }) + "\n"
-            );
+      attachNdjsonReader(socket, {
+        onDropped: reportDroppedFrameToStderr(`native-devtools ${udid.slice(0, 8)}`),
+        onMessage: (parsed) => {
+          const msg = parsed;
+          if (bundleId === null) {
+            if (msg.type !== "Control") return;
+            bundleId = msg.payload.bundleId;
+            const existing = connections2.get(bundleId);
+            if (existing) {
+              existing.socket.destroy();
+            }
+            connections2.set(bundleId, { socket, networkLog: [] });
+            if (activatedBundleIds.has(bundleId)) {
+              socket.write(
+                JSON.stringify({
+                  type: "Control",
+                  payload: { command: "activateNetworkInspection" }
+                }) + "\n"
+              );
+            }
+            return;
           }
-          return;
-        }
-        if (msg.type === "CDP") {
-          const p = msg.payload;
-          if (p.method && p.id === void 0) {
-            const conn = connections2.get(bundleId);
-            if (conn) {
-              if (conn.networkLog.length >= MAX_LOG_ENTRIES) {
-                conn.networkLog.shift();
+          if (msg.type === "CDP") {
+            const p = msg.payload;
+            if (p.method && p.id === void 0) {
+              const conn = connections2.get(bundleId);
+              if (conn) {
+                if (conn.networkLog.length >= MAX_LOG_ENTRIES) {
+                  conn.networkLog.shift();
+                }
+                conn.networkLog.push({
+                  method: p.method,
+                  params: p.params,
+                  timestamp: Date.now()
+                });
               }
-              conn.networkLog.push({
-                method: p.method,
-                params: p.params,
-                timestamp: Date.now()
-              });
             }
           }
-        }
-        if (msg.type === "ViewInspector") {
-          const p = msg.payload;
-          const pending = pendingRpc.get(p.id);
-          if (!pending) return;
-          pendingRpc.delete(p.id);
-          if (p.error) {
-            pending.reject(
-              new FailureError(p.error.message, {
-                error_code: FAILURE_CODES.NATIVE_DEVTOOLS_RPC_ERROR,
-                failure_stage: "native_devtools_rpc_response",
-                failure_area: "tool_server",
-                error_kind: "subprocess"
-              })
-            );
-          } else pending.resolve(p.result);
+          if (msg.type === "ViewInspector") {
+            const p = msg.payload;
+            const pending = pendingRpc.get(p.id);
+            if (!pending) return;
+            pendingRpc.delete(p.id);
+            if (p.error) {
+              pending.reject(
+                new FailureError(p.error.message, {
+                  error_code: FAILURE_CODES.NATIVE_DEVTOOLS_RPC_ERROR,
+                  failure_stage: "native_devtools_rpc_response",
+                  failure_area: "tool_server",
+                  error_kind: "subprocess"
+                })
+              );
+            } else pending.resolve(p.result);
+          }
         }
       });
       socket.on("close", () => {
-        rl.close();
         if (bundleId !== null) {
           if (connections2.get(bundleId)?.socket === socket) {
             connections2.delete(bundleId);
@@ -109994,22 +110156,28 @@ async function describeIos(registry2, device, params, options = {}) {
   if (isTvOs) {
     return { tree: emptyTree(), source: "ax-service", hint: TVOS_HINT };
   }
-  let tree;
+  let tree = emptyTree();
   let degraded;
   let resolverHint;
+  let readFailureHint;
+  let axApi;
   try {
     const axRef = axServiceRef(device);
-    const axApi = await registry2.resolveService(axRef.urn, axRef.options);
-    const response = await axApi.describe();
-    tree = adaptAXDescribeToDescribeResult(response);
+    axApi = await registry2.resolveService(axRef.urn, axRef.options);
     degraded = axApi.degraded;
   } catch (err) {
-    tree = emptyTree();
     resolverHint = tcpArtifactHint(err);
     degraded = resolverHint === void 0;
   }
+  if (axApi) {
+    try {
+      tree = adaptAXDescribeToDescribeResult(await axApi.describe());
+    } catch (err) {
+      readFailureHint = `The accessibility read failed (${errMsg(err)}).`;
+    }
+  }
   const degradedHint = !degraded ? void 0 : tree.children.length === 0 ? DEGRADED_BLIND_HINT : DEGRADED_STANDING_HINT;
-  const hint = resolverHint ?? degradedHint;
+  const hint = resolverHint ?? (readFailureHint ? degradedHint ? `${degradedHint}. ${readFailureHint}` : readFailureHint : degradedHint);
   if (tree.children.length > 0) {
     return { tree, source: "ax-service", hint };
   }
@@ -110501,7 +110669,7 @@ function parseUiAutomatorDump(rawOutput, screenW, screenH, options = {}) {
 
 // ../tool-server/src/blueprints/android-devtools.ts
 var import_node_child_process13 = require("node:child_process");
-var readline5 = __toESM(require("node:readline"));
+var readline2 = __toESM(require("node:readline"));
 init_src();
 
 // ../native-devtools-android/src/index.ts
@@ -110898,7 +111066,6 @@ async function ensureAndroidDevtoolsInstalled(serial) {
 
 // ../tool-server/src/utils/android-devtools-client.ts
 var net3 = __toESM(require("node:net"));
-var readline4 = __toESM(require("node:readline"));
 init_src();
 var DEFAULT_RPC_TIMEOUT_MS = 5e3;
 var LONG_RPC_TIMEOUT_MS = 15e3;
@@ -110932,36 +111099,32 @@ function connectAndroidDevtoolsClient(localPort, onTerminated) {
       onTerminated(error52);
     };
     socket.once("connect", () => {
-      const rl = readline4.createInterface({ input: socket });
-      rl.on("line", (line) => {
-        if (!line.trim()) return;
-        let parsed;
-        try {
-          parsed = JSON.parse(line);
-        } catch {
-          return;
-        }
-        if (typeof parsed.id !== "number") return;
-        const req = pending.get(parsed.id);
-        if (!req) return;
-        pending.delete(parsed.id);
-        clearTimeout(req.timer);
-        if (parsed.error) {
-          const message = parsed.error.message ?? "Unknown helper error";
-          const type = parsed.error.type ?? "HelperError";
-          req.reject(
-            new FailureError(`${type}: ${message}`, {
-              error_code: FAILURE_CODES.ANDROID_DEVTOOLS_RPC_ERROR,
-              failure_stage: "android_devtools_rpc_response",
-              failure_area: "tool_server",
-              error_kind: "subprocess"
-            })
-          );
-        } else {
-          req.resolve(parsed.result);
+      attachNdjsonReader(socket, {
+        onDropped: reportDroppedFrameToStderr("android-devtools"),
+        onMessage: (raw) => {
+          const parsed = raw;
+          if (typeof parsed.id !== "number") return;
+          const req = pending.get(parsed.id);
+          if (!req) return;
+          pending.delete(parsed.id);
+          clearTimeout(req.timer);
+          if (parsed.error) {
+            const message = parsed.error.message ?? "Unknown helper error";
+            const type = parsed.error.type ?? "HelperError";
+            req.reject(
+              new FailureError(`${type}: ${message}`, {
+                error_code: FAILURE_CODES.ANDROID_DEVTOOLS_RPC_ERROR,
+                failure_stage: "android_devtools_rpc_response",
+                failure_area: "tool_server",
+                error_kind: "subprocess"
+              })
+            );
+          } else {
+            req.resolve(parsed.result);
+          }
         }
       });
-      rl.on("close", () => cleanup());
+      socket.on("close", () => cleanup());
       resolve12({
         request(method, params = {}) {
           const send = () => {
@@ -111076,7 +111239,7 @@ async function spawnHelper(serial) {
       cleanup?.();
       fn();
     };
-    const rl = readline5.createInterface({ input: proc.stdout });
+    const rl = readline2.createInterface({ input: proc.stdout });
     rl.on("line", async (rawLine) => {
       const line = rawLine.trim();
       const portMatch = HELPER_PORT_MARKER.exec(line);
@@ -116837,13 +117000,7 @@ var zodSchema9 = external_exports.object({
 function bootTarget(params) {
   return params.udid ?? params.avdName ?? params.vvdImage ?? params.electronAppPath ?? "device";
 }
-var LAUNCH_HARDENING_ARGS = [
-  "-no-boot-anim",
-  "-netfast",
-  "-crash-report-mode",
-  "never",
-  "-no-metrics"
-];
+var LAUNCH_HARDENING_ARGS = ["-no-boot-anim", "-netfast", "-no-metrics"];
 function launchHardeningArgs(sound) {
   return sound ? [...LAUNCH_HARDENING_ARGS] : ["-noaudio", ...LAUNCH_HARDENING_ARGS];
 }
@@ -117357,7 +117514,7 @@ async function bootAndroidImpl(params) {
   } else {
     const RENDERER_ARGS = ["-gpu", gpuMode, ...extraEmulatorArgs];
     const probe3 = await checkSnapshotLoadable(params.avdName, "default_boot", {
-      extraArgs: [...RENDERER_ARGS, ...hardeningArgs]
+      extraArgs: [...RENDERER_ARGS, ...hardeningArgs, ...crashReportArgs]
     });
     if (!probe3.loadable) {
       hotBootFailureReason = `-check-snapshot-loadable: ${probe3.reason ?? "unknown"}`;
@@ -119392,7 +119549,7 @@ Before tapping, determine the correct coordinates by using discovery tools \u201
     const api = services.simulatorServer;
     for (let i = 1; i <= clickCount; i++) {
       if (i > 1) await sleep2(MULTI_TAP_GAP_MS);
-      sendCommand(api, {
+      await sendCommand(api, {
         cmd: "touch",
         type: "Down",
         x: params.x,
@@ -119401,7 +119558,7 @@ Before tapping, determine the correct coordinates by using discovery tools \u201
         second_y: null
       });
       await sleep2(TAP_HOLD_MS);
-      sendCommand(api, {
+      await sendCommand(api, {
         cmd: "touch",
         type: "Up",
         x: params.x,
@@ -119486,20 +119643,24 @@ Pass momentum:false for a momentum-free swipe that lands where the finger lifts
     let lastY = 0;
     for (let i = 0; i <= steps; i++) {
       if (ctx?.signal?.aborted) {
-        if (i > 0) {
-          sendCommand(api, {
-            cmd: "touch",
-            type: "Up",
-            x: lastX,
-            y: lastY,
-            second_x: null,
-            second_y: null
-          });
-        }
         const err = new Error(
           `gesture-swipe aborted - cancelled mid-gesture after ${i} of ${steps + 1} frames`
         );
         err.name = "AbortError";
+        if (i > 0) {
+          try {
+            await sendCommand(api, {
+              cmd: "touch",
+              type: "Up",
+              x: lastX,
+              y: lastY,
+              second_x: null,
+              second_y: null
+            });
+          } catch (liftErr) {
+            err.cause = liftErr;
+          }
+        }
         throw err;
       }
       const t = i / steps;
@@ -119508,7 +119669,7 @@ Pass momentum:false for a momentum-free swipe that lands where the finger lifts
       const y = params.fromY + (params.toY - params.fromY) * progress;
       const type = i === 0 ? "Down" : i === steps ? "Up" : "Move";
       if (type === "Up") {
-        sendCommand(api, {
+        await sendCommand(api, {
           cmd: "touch",
           type: "Move",
           x,
@@ -119517,7 +119678,7 @@ Pass momentum:false for a momentum-free swipe that lands where the finger lifts
           second_y: null
         });
       }
-      sendCommand(api, {
+      await sendCommand(api, {
         cmd: "touch",
         type,
         x,
@@ -119760,7 +119921,7 @@ function interpolateEvents(events, steps) {
   return result;
 }
 function sendTouchEvent(api, type, x, y, x2, y2) {
-  sendCommand(api, {
+  return sendCommand(api, {
     cmd: "touch",
     type,
     x,
@@ -119831,7 +119992,7 @@ Example pinch-to-zoom (with interpolate:10 for smoothness):
     const events = params.interpolate && params.interpolate > 0 ? interpolateEvents(params.events, params.interpolate) : params.events;
     for (const event2 of events) {
       await sleep6(event2.delayMs ?? 16);
-      sendCommand(api, {
+      await sendCommand(api, {
         cmd: "touch",
         type: event2.type,
         x: event2.x,
@@ -119914,7 +120075,7 @@ Use when you need to zoom in or out on a map, image, or zoomable view. Returns {
       const y2 = cy + halfDist * sinA;
       const type = i === 0 ? "Down" : i === steps ? "Up" : "Move";
       if (i === 0) timestampMs = Date.now();
-      sendTouchEvent(api, type, x1, y1, x2, y2);
+      await sendTouchEvent(api, type, x1, y1, x2, y2);
       if (i < steps) await sleep(16);
     }
     return { pinched: true, timestampMs };
@@ -119992,11 +120153,17 @@ Size the orbit with radius, or with radiusX and radiusY together (the pair overr
     let lastY2 = 0;
     for (let i = 0; i <= steps; i++) {
       if (ctx?.signal?.aborted) {
-        if (i > 0) sendTouchEvent(api, "Up", lastX1, lastY1, lastX2, lastY2);
         const err = new Error(
           `gesture-rotate aborted \u2014 cancelled mid-gesture after ${i} of ${steps + 1} frames`
         );
         err.name = "AbortError";
+        if (i > 0) {
+          try {
+            await sendTouchEvent(api, "Up", lastX1, lastY1, lastX2, lastY2);
+          } catch (liftErr) {
+            err.cause = liftErr;
+          }
+        }
         throw err;
       }
       const t = i / steps;
@@ -120008,7 +120175,7 @@ Size the orbit with radius, or with radiusX and radiusY together (the pair overr
       const y2 = params.centerY - radiusY * Math.sin(angleRad);
       const type = i === 0 ? "Down" : i === steps ? "Up" : "Move";
       if (i === 0) timestampMs = Date.now();
-      sendTouchEvent(api, type, x1, y1, x2, y2);
+      await sendTouchEvent(api, type, x1, y1, x2, y2);
       lastX1 = x1;
       lastY1 = y1;
       lastX2 = x2;
@@ -120077,13 +120244,13 @@ Fails if the device backend is not reachable \u2014 the simulator-server for iOS
       return { pressed: params.button };
     }
     const api = services.simulatorServer;
-    sendCommand(api, {
+    await sendCommand(api, {
       cmd: "button",
       direction: "Down",
       button: params.button
     });
     await sleep7(50);
-    sendCommand(api, { cmd: "button", direction: "Up", button: params.button });
+    await sendCommand(api, { cmd: "button", direction: "Up", button: params.button });
     return { pressed: params.button };
   }
 };
@@ -120894,7 +121061,7 @@ Returns { orientation }. Fails if the target device is not booted.`,
   }),
   async execute(services, params) {
     const api = services.simulatorServer;
-    sendCommand(api, { cmd: "rotate", direction: params.orientation });
+    await sendCommand(api, { cmd: "rotate", direction: params.orientation });
     return { orientation: params.orientation };
   }
 };