@swmansion/argent 0.16.2-next.0 → 0.16.2-next.2

package/dist/tool-server.cjs

@@ -34918,7 +34918,7 @@ var require_view = __commonJS({
     var dirname14 = path36.dirname;
     var basename9 = path36.basename;
     var extname4 = path36.extname;
-    var join44 = path36.join;
+    var join45 = path36.join;
     var resolve7 = path36.resolve;
     module2.exports = View;
     function View(name, options) {
@@ -34980,12 +34980,12 @@ var require_view = __commonJS({
     };
     View.prototype.resolve = function resolve8(dir, file2) {
       var ext = this.ext;
-      var path37 = join44(dir, file2);
+      var path37 = join45(dir, file2);
       var stat4 = tryStat(path37);
       if (stat4 && stat4.isFile()) {
         return path37;
       }
-      path37 = join44(dir, basename9(file2, ext), "index" + ext);
+      path37 = join45(dir, basename9(file2, ext), "index" + ext);
       stat4 = tryStat(path37);
       if (stat4 && stat4.isFile()) {
         return path37;
@@ -46737,7 +46737,7 @@ var require_application = __commonJS({
     var finalhandler = require_finalhandler();
     var debug = require_src()("express:application");
     var View = require_view();
-    var http3 = require("node:http");
+    var http4 = require("node:http");
     var methods = require_utils3().methods;
     var compileETag = require_utils3().compileETag;
     var compileQueryParser = require_utils3().compileQueryParser;
@@ -46970,7 +46970,7 @@ var require_application = __commonJS({
       tryRender(view, renderOptions, done);
     };
     app.listen = function listen() {
-      var server = http3.createServer(this);
+      var server = http4.createServer(this);
       var args = slice.call(arguments);
       if (typeof args[args.length - 1] === "function") {
         var done = args[args.length - 1] = once(args[args.length - 1]);
@@ -47458,11 +47458,11 @@ var require_negotiator = __commonJS({
     var preferredMediaTypes = require_mediaType();
     module2.exports = Negotiator;
     module2.exports.Negotiator = Negotiator;
-    function Negotiator(request2) {
+    function Negotiator(request3) {
       if (!(this instanceof Negotiator)) {
-        return new Negotiator(request2);
+        return new Negotiator(request3);
       }
-      this.request = request2;
+      this.request = request3;
     }
     Negotiator.prototype.charset = function charset(available) {
       var set2 = this.charsets(available);
@@ -57250,12 +57250,12 @@ var require_request = __commonJS({
     var accepts = require_accepts();
     var isIP = require("node:net").isIP;
     var typeis = require_type_is();
-    var http3 = require("node:http");
+    var http4 = require("node:http");
     var fresh = require_fresh();
     var parseRange = require_range_parser();
     var parse4 = require_parseurl();
     var proxyaddr = require_proxy_addr();
-    var req = Object.create(http3.IncomingMessage.prototype);
+    var req = Object.create(http4.IncomingMessage.prototype);
     module2.exports = req;
     req.get = req.header = function header(name) {
       if (!name) {
@@ -67309,7 +67309,7 @@ var require_send = __commonJS({
     var Stream2 = require("stream");
     var util = require("util");
     var extname4 = path36.extname;
-    var join44 = path36.join;
+    var join45 = path36.join;
     var normalize = path36.normalize;
     var resolve7 = path36.resolve;
     var sep6 = path36.sep;
@@ -67481,7 +67481,7 @@ var require_send = __commonJS({
           return res;
         }
         parts = path37.split(sep6);
-        path37 = normalize(join44(root2, path37));
+        path37 = normalize(join45(root2, path37));
       } else {
         if (UP_PATH_REGEXP.test(path37)) {
           debug('malicious path "%s"', path37);
@@ -67614,7 +67614,7 @@ var require_send = __commonJS({
           if (err) return self2.onStatError(err);
           return self2.error(404);
         }
-        var p = join44(path37, self2._index[i]);
+        var p = join45(path37, self2._index[i]);
         debug('stat "%s"', p);
         fs46.stat(p, function(err2, stat4) {
           if (err2) return next(err2);
@@ -67854,7 +67854,7 @@ var require_response = __commonJS({
     var deprecate = require_depd()("express");
     var encodeUrl = require_encodeurl();
     var escapeHtml = require_escape_html();
-    var http3 = require("node:http");
+    var http4 = require("node:http");
     var onFinished = require_on_finished();
     var mime = require_mime_types2();
     var path36 = require("node:path");
@@ -67870,7 +67870,7 @@ var require_response = __commonJS({
     var resolve7 = path36.resolve;
     var vary = require_vary();
     var { Buffer: Buffer2 } = require("node:buffer");
-    var res = Object.create(http3.ServerResponse.prototype);
+    var res = Object.create(http4.ServerResponse.prototype);
     module2.exports = res;
     res.status = function status(code) {
       if (!Number.isInteger(code)) {
@@ -68467,7 +68467,40 @@ var require_express2 = __commonJS({
   }
 });
 
+// ../tool-server/src/utils/command-on-path.ts
+async function commandOnPath(name) {
+  if (!/^[A-Za-z0-9_.-]+$/.test(name)) return null;
+  try {
+    if (process.platform === "win32") {
+      const { stdout: stdout2 } = await execFileAsync("where", [name], { timeout: 2e3 });
+      const cwd = import_node_path2.win32.resolve(process.cwd()).toLowerCase();
+      const match = stdout2.split(/\r?\n/).map((line) => line.trim()).filter(Boolean).find((candidate) => import_node_path2.win32.resolve(import_node_path2.win32.dirname(candidate)).toLowerCase() !== cwd);
+      return match ?? null;
+    }
+    const { stdout } = await execFileAsync("/bin/sh", ["-c", `command -v ${name}`], {
+      timeout: 2e3
+    });
+    const trimmed = stdout.trim();
+    return trimmed || null;
+  } catch {
+    return null;
+  }
+}
+var import_node_child_process2, import_node_util, import_node_path2, execFileAsync;
+var init_command_on_path = __esm({
+  "../tool-server/src/utils/command-on-path.ts"() {
+    "use strict";
+    import_node_child_process2 = require("node:child_process");
+    import_node_util = require("node:util");
+    import_node_path2 = require("node:path");
+    execFileAsync = (0, import_node_util.promisify)(import_node_child_process2.execFile);
+  }
+});
+
 // ../tool-server/src/utils/android-binary.ts
+function binFileName(name) {
+  return `${name}${BIN_EXT}`;
+}
 async function resolveAndroidBinary(name) {
   const now = Date.now();
   const cached3 = cache2.get(name);
@@ -68477,16 +68510,10 @@ async function resolveAndroidBinary(name) {
   return resolved;
 }
 async function probe(name) {
-  try {
-    const { stdout } = await execFileAsync("/bin/sh", ["-c", `command -v ${name}`], {
-      timeout: 2e3
-    });
-    const trimmed = stdout.trim();
-    if (trimmed) return trimmed;
-  } catch {
-  }
+  const onPath = await commandOnPath(name);
+  if (onPath) return onPath;
   for (const root2 of androidRoots()) {
-    const candidate = (0, import_node_path2.join)(root2, SUBDIR[name], name);
+    const candidate = (0, import_node_path3.join)(root2, SUBDIR[name], binFileName(name));
     try {
       await (0, import_promises2.access)(candidate, import_node_fs3.constants.X_OK);
       return candidate;
@@ -68504,15 +68531,15 @@ function androidRoots() {
 function defaultAndroidRoots() {
   const home = (0, import_node_os2.homedir)();
   const roots = [
-    // Android Studio defaults (the two big ones — covers the majority of
-    // user installs that arrive without any env-var setup).
-    (0, import_node_path2.join)(home, "Library", "Android", "sdk"),
+    // Android Studio defaults (the big ones — cover the majority of user
+    // installs that arrive without any env-var setup).
+    (0, import_node_path3.join)(home, "Library", "Android", "sdk"),
     // macOS Android Studio default
-    (0, import_node_path2.join)(home, "Android", "Sdk"),
+    (0, import_node_path3.join)(home, "Android", "Sdk"),
     // Linux Android Studio default
     // Common manual install convention. Not picked by any installer but used
     // often enough in tutorials and Dockerfiles that probing it costs little.
-    (0, import_node_path2.join)(home, "android-sdk"),
+    (0, import_node_path3.join)(home, "android-sdk"),
     // System-wide locations (Linux package managers, Homebrew on macOS).
     "/opt/android-sdk",
     "/usr/lib/android-sdk",
@@ -68520,23 +68547,27 @@ function defaultAndroidRoots() {
     "/usr/local/share/android-sdk"
     // Homebrew cask
   ];
+  if (process.platform === "win32") {
+    const localAppData = process.env.LOCALAPPDATA?.trim();
+    if (localAppData) roots.push((0, import_node_path3.join)(localAppData, "Android", "Sdk"));
+    roots.push((0, import_node_path3.join)(home, "AppData", "Local", "Android", "Sdk"));
+  }
   return roots;
 }
-var import_node_child_process2, import_promises2, import_node_fs3, import_node_os2, import_node_path2, import_node_util, execFileAsync, SUBDIR, CACHE_TTL_MS, cache2;
+var import_promises2, import_node_fs3, import_node_os2, import_node_path3, SUBDIR, BIN_EXT, CACHE_TTL_MS, cache2;
 var init_android_binary = __esm({
   "../tool-server/src/utils/android-binary.ts"() {
     "use strict";
-    import_node_child_process2 = require("node:child_process");
     import_promises2 = require("node:fs/promises");
     import_node_fs3 = require("node:fs");
     import_node_os2 = require("node:os");
-    import_node_path2 = require("node:path");
-    import_node_util = require("node:util");
-    execFileAsync = (0, import_node_util.promisify)(import_node_child_process2.execFile);
+    import_node_path3 = require("node:path");
+    init_command_on_path();
     SUBDIR = {
       adb: "platform-tools",
       emulator: "emulator"
     };
+    BIN_EXT = process.platform === "win32" ? ".exe" : "";
     CACHE_TTL_MS = 6e4;
     cache2 = /* @__PURE__ */ new Map();
   }
@@ -74596,12 +74627,12 @@ var require_service = __commonJS({
       this.requestDelimited = Boolean(requestDelimited);
       this.responseDelimited = Boolean(responseDelimited);
     }
-    Service.prototype.rpcCall = function rpcCall(method, requestCtor, responseCtor, request2, callback) {
-      if (!request2)
+    Service.prototype.rpcCall = function rpcCall(method, requestCtor, responseCtor, request3, callback) {
+      if (!request3)
         throw TypeError("request must be specified");
       var self2 = this;
       if (!callback)
-        return util.asPromise(rpcCall, self2, method, requestCtor, responseCtor, request2);
+        return util.asPromise(rpcCall, self2, method, requestCtor, responseCtor, request3);
       if (!self2.rpcImpl) {
         setTimeout(function() {
           callback(Error("already ended"));
@@ -74611,7 +74642,7 @@ var require_service = __commonJS({
       try {
         return self2.rpcImpl(
           method,
-          requestCtor[self2.requestDelimited ? "encodeDelimited" : "encode"](request2).finish(),
+          requestCtor[self2.requestDelimited ? "encodeDelimited" : "encode"](request3).finish(),
           function rpcCallback(err, response) {
             if (err) {
               self2.emit("error", err, method);
@@ -74842,13 +74873,13 @@ var require_path = __commonJS({
   "../../node_modules/@protobufjs/path/index.js"(exports2) {
     "use strict";
     var path36 = exports2;
-    var isAbsolute5 = (
+    var isAbsolute6 = (
       /**
        * Tests if the specified path is absolute.
        * @param {string} path Path to test
        * @returns {boolean} `true` if path is absolute
        */
-      path36.isAbsolute = function isAbsolute6(path37) {
+      path36.isAbsolute = function isAbsolute7(path37) {
         return /^(?:\/|\w+:)/.test(path37);
       }
     );
@@ -74860,7 +74891,7 @@ var require_path = __commonJS({
        */
       path36.normalize = function normalize2(path37) {
         path37 = path37.replace(/\\/g, "/").replace(/\/{2,}/g, "/");
-        var parts = path37.split("/"), absolute = isAbsolute5(path37), prefix = "";
+        var parts = path37.split("/"), absolute = isAbsolute6(path37), prefix = "";
         if (absolute)
           prefix = parts.shift() + "/";
         for (var i = 0; i < parts.length; ) {
@@ -74882,7 +74913,7 @@ var require_path = __commonJS({
     path36.resolve = function resolve7(originPath, includePath, alreadyNormalized) {
       if (!alreadyNormalized)
         includePath = normalize(includePath);
-      if (isAbsolute5(includePath))
+      if (isAbsolute6(includePath))
         return includePath;
       if (!alreadyNormalized)
         originPath = normalize(originPath);
@@ -75426,8 +75457,8 @@ var require_service2 = __commonJS({
       this.methodsArray.length; ++i) {
         var methodName = util.lcFirst((method = this._methodsArray[i]).resolve().name).replace(/[^$\w_]/g, "");
         rpcService[methodName] = /* @__PURE__ */ (function(method2, requestType, responseType) {
-          return function rpcMethod(request2, callback) {
-            return rpc.Service.prototype.rpcCall.call(this, method2, requestType, responseType, request2, callback);
+          return function rpcMethod(request3, callback) {
+            return rpc.Service.prototype.rpcCall.call(this, method2, requestType, responseType, request3, callback);
           };
         })(method, method.resolvedRequestType.ctor, method.resolvedResponseType.ctor);
       }
@@ -81111,7 +81142,7 @@ var require_websocket = __commonJS({
     "use strict";
     var EventEmitter2 = require("events");
     var https = require("https");
-    var http3 = require("http");
+    var http4 = require("http");
     var net6 = require("net");
     var tls = require("tls");
     var { randomBytes, createHash: createHash3 } = require("crypto");
@@ -81653,7 +81684,7 @@ var require_websocket = __commonJS({
       }
       const defaultPort = isSecure ? 443 : 80;
       const key = randomBytes(16).toString("base64");
-      const request2 = isSecure ? https.request : http3.request;
+      const request3 = isSecure ? https.request : http4.request;
       const protocolSet = /* @__PURE__ */ new Set();
       let perMessageDeflate;
       opts.createConnection = opts.createConnection || (isSecure ? tlsConnect : netConnect);
@@ -81730,12 +81761,12 @@ var require_websocket = __commonJS({
         if (opts.auth && !options.headers.authorization) {
           options.headers.authorization = "Basic " + Buffer.from(opts.auth).toString("base64");
         }
-        req = websocket._req = request2(opts);
+        req = websocket._req = request3(opts);
         if (websocket._redirects) {
           websocket.emit("redirect", websocket.url, req);
         }
       } else {
-        req = websocket._req = request2(opts);
+        req = websocket._req = request3(opts);
       }
       if (opts.timeout) {
         req.on("timeout", () => {
@@ -82149,7 +82180,7 @@ var require_websocket_server = __commonJS({
   "../../node_modules/ws/lib/websocket-server.js"(exports2, module2) {
     "use strict";
     var EventEmitter2 = require("events");
-    var http3 = require("http");
+    var http4 = require("http");
     var { Duplex } = require("stream");
     var { createHash: createHash3 } = require("crypto");
     var extension2 = require_extension();
@@ -82230,8 +82261,8 @@ var require_websocket_server = __commonJS({
           );
         }
         if (options.port != null) {
-          this._server = http3.createServer((req, res) => {
-            const body = http3.STATUS_CODES[426];
+          this._server = http4.createServer((req, res) => {
+            const body = http4.STATUS_CODES[426];
             res.writeHead(426, {
               "Content-Length": body.length,
               "Content-Type": "text/plain"
@@ -82520,7 +82551,7 @@ var require_websocket_server = __commonJS({
       this.destroy();
     }
     function abortHandshake(socket, code, message, headers) {
-      message = message || http3.STATUS_CODES[code];
+      message = message || http4.STATUS_CODES[code];
       headers = {
         Connection: "close",
         "Content-Type": "text/html",
@@ -82529,7 +82560,7 @@ var require_websocket_server = __commonJS({
       };
       socket.once("finish", socket.destroy);
       socket.end(
-        `HTTP/1.1 ${code} ${http3.STATUS_CODES[code]}\r
+        `HTTP/1.1 ${code} ${http4.STATUS_CODES[code]}\r
 ` + Object.keys(headers).map((h) => `${h}: ${headers[h]}`).join("\r\n") + "\r\n\r\n" + message
       );
     }
@@ -82852,7 +82883,7 @@ async function emulatorSupportsFlag(flag, options = {}) {
   if (cached3 !== void 0) return cached3;
   let output;
   try {
-    const { stdout, stderr } = await execFileAsync9(emulatorPath, ["-help"], {
+    const { stdout, stderr } = await execFileAsync8(emulatorPath, ["-help"], {
       timeout: options.timeoutMs ?? 1e4,
       maxBuffer: 8 * 1024 * 1024
     });
@@ -82879,7 +82910,7 @@ function describeAdbFailure(args, err) {
 async function runAdb(args, options = {}) {
   const adbPath = await resolveAdbOrThrow();
   try {
-    const { stdout, stderr } = await execFileAsync9(adbPath, args, {
+    const { stdout, stderr } = await execFileAsync8(adbPath, args, {
       timeout: options.timeoutMs ?? 3e4,
       killSignal: ADB_KILL_SIGNAL,
       maxBuffer: 64 * 1024 * 1024,
@@ -82893,7 +82924,7 @@ async function runAdb(args, options = {}) {
 async function runAdbBinary(args, options = {}) {
   const adbPath = await resolveAdbOrThrow();
   try {
-    const { stdout } = await execFileAsync9(adbPath, args, {
+    const { stdout } = await execFileAsync8(adbPath, args, {
       timeout: options.timeoutMs ?? 3e4,
       killSignal: ADB_KILL_SIGNAL,
       maxBuffer: 64 * 1024 * 1024,
@@ -83069,7 +83100,7 @@ async function listAvds() {
   const emulatorPath = await resolveAndroidBinary("emulator");
   if (!emulatorPath) return [];
   try {
-    const { stdout } = await execFileAsync9(emulatorPath, ["-list-avds"], { timeout: 5e3 });
+    const { stdout } = await execFileAsync8(emulatorPath, ["-list-avds"], { timeout: 5e3 });
     return stdout.split("\n").map((l) => l.trim()).filter((l) => l && AVD_NAME_PATTERN.test(l)).map((name) => ({ name }));
   } catch {
     return [];
@@ -83085,7 +83116,7 @@ async function checkSnapshotLoadable(avdName, snapshotName = "default_boot", opt
       "-check-snapshot-loadable",
       snapshotName
     ];
-    const { stdout } = await execFileAsync9(emulatorPath, args, {
+    const { stdout } = await execFileAsync8(emulatorPath, args, {
       timeout: options.timeoutMs ?? 1e4,
       maxBuffer: 4 * 1024 * 1024
     });
@@ -83101,7 +83132,7 @@ async function checkSnapshotLoadable(avdName, snapshotName = "default_boot", opt
   }
 }
 function avdRootCandidates() {
-  const home = process.env.HOME ?? "";
+  const home = (0, import_node_os5.homedir)();
   const candidates = [
     process.env.ANDROID_USER_HOME ? `${process.env.ANDROID_USER_HOME}/avd` : null,
     process.env.ANDROID_AVD_HOME,
@@ -83109,7 +83140,7 @@ function avdRootCandidates() {
     process.env.ANDROID_SDK_HOME ? `${process.env.ANDROID_SDK_HOME}/.android/avd` : null,
     home ? `${home}/.android/avd` : null
   ];
-  return candidates.filter((p) => Boolean(p && p.startsWith("/")));
+  return candidates.filter((p) => Boolean(p && (0, import_node_path6.isAbsolute)(p)));
 }
 async function resolveAvdPath(avdName) {
   const { readFile: readFile11 } = await import("node:fs/promises");
@@ -83119,7 +83150,7 @@ async function resolveAvdPath(avdName) {
       const raw = (0, import_ini.parse)(content).path;
       if (typeof raw !== "string") continue;
       const trimmed = raw.trim();
-      if (!trimmed.startsWith("/")) continue;
+      if (!(0, import_node_path6.isAbsolute)(trimmed)) continue;
       return trimmed;
     } catch {
     }
@@ -83143,17 +83174,19 @@ async function hasDefaultBootSnapshot(avdName) {
     return false;
   }
 }
-var import_node_child_process11, import_node_util9, import_ini, execFileAsync9, emulatorFlagSupportCache, ADB_KILL_SIGNAL, ADB_DEVICE_STATES, ADB_DEVICES_TIMEOUT_MS, ENRICH_TIMEOUT_MS, androidRuntimeKindCache, TERMINAL_ADB_ERROR_PATTERNS, AVD_NAME_PATTERN;
+var import_node_child_process10, import_node_util8, import_node_os5, import_node_path6, import_ini, execFileAsync8, emulatorFlagSupportCache, ADB_KILL_SIGNAL, ADB_DEVICE_STATES, ADB_DEVICES_TIMEOUT_MS, ENRICH_TIMEOUT_MS, androidRuntimeKindCache, TERMINAL_ADB_ERROR_PATTERNS, AVD_NAME_PATTERN;
 var init_adb = __esm({
   "../tool-server/src/utils/adb.ts"() {
     "use strict";
-    import_node_child_process11 = require("node:child_process");
-    import_node_util9 = require("node:util");
+    import_node_child_process10 = require("node:child_process");
+    import_node_util8 = require("node:util");
+    import_node_os5 = require("node:os");
+    import_node_path6 = require("node:path");
     import_ini = __toESM(require_ini());
     init_src();
     init_android_binary();
     init_subprocess_error();
-    execFileAsync9 = (0, import_node_util9.promisify)(import_node_child_process11.execFile);
+    execFileAsync8 = (0, import_node_util8.promisify)(import_node_child_process10.execFile);
     emulatorFlagSupportCache = /* @__PURE__ */ new Map();
     ADB_KILL_SIGNAL = "SIGKILL";
     ADB_DEVICE_STATES = /* @__PURE__ */ new Set([
@@ -84386,7 +84419,7 @@ var require_common3 = __commonJS({
     }
     var path36 = require("path");
     var minimatch = require_minimatch();
-    var isAbsolute5 = require_path_is_absolute();
+    var isAbsolute6 = require_path_is_absolute();
     var Minimatch = minimatch.Minimatch;
     function alphasorti(a, b) {
       return a.toLowerCase().localeCompare(b.toLowerCase());
@@ -84529,7 +84562,7 @@ var require_common3 = __commonJS({
       var abs = f;
       if (f.charAt(0) === "/") {
         abs = path36.join(self2.root, f);
-      } else if (isAbsolute5(f) || f === "") {
+      } else if (isAbsolute6(f) || f === "") {
         abs = f;
       } else if (self2.changedCwd) {
         abs = path36.resolve(self2.cwd, f);
@@ -84567,7 +84600,7 @@ var require_sync = __commonJS({
     var util = require("util");
     var path36 = require("path");
     var assert2 = require("assert");
-    var isAbsolute5 = require_path_is_absolute();
+    var isAbsolute6 = require_path_is_absolute();
     var common = require_common3();
     var alphasort = common.alphasort;
     var alphasorti = common.alphasorti;
@@ -84641,8 +84674,8 @@ var require_sync = __commonJS({
       var read;
       if (prefix === null)
         read = ".";
-      else if (isAbsolute5(prefix) || isAbsolute5(pattern.join("/"))) {
-        if (!prefix || !isAbsolute5(prefix))
+      else if (isAbsolute6(prefix) || isAbsolute6(pattern.join("/"))) {
+        if (!prefix || !isAbsolute6(prefix))
           prefix = "/" + prefix;
         read = prefix;
       } else
@@ -84827,7 +84860,7 @@ var require_sync = __commonJS({
         this.matches[index] = /* @__PURE__ */ Object.create(null);
       if (!exists2)
         return;
-      if (prefix && isAbsolute5(prefix) && !this.nomount) {
+      if (prefix && isAbsolute6(prefix) && !this.nomount) {
         var trail = /[\/\\]$/.test(prefix);
         if (prefix.charAt(0) === "/") {
           prefix = path36.join(this.root, prefix);
@@ -84947,7 +84980,7 @@ var require_glob = __commonJS({
     var EE = require("events").EventEmitter;
     var path36 = require("path");
     var assert2 = require("assert");
-    var isAbsolute5 = require_path_is_absolute();
+    var isAbsolute6 = require_path_is_absolute();
     var globSync = require_sync();
     var common = require_common3();
     var alphasort = common.alphasort;
@@ -85161,8 +85194,8 @@ var require_glob = __commonJS({
       var read;
       if (prefix === null)
         read = ".";
-      else if (isAbsolute5(prefix) || isAbsolute5(pattern.join("/"))) {
-        if (!prefix || !isAbsolute5(prefix))
+      else if (isAbsolute6(prefix) || isAbsolute6(pattern.join("/"))) {
+        if (!prefix || !isAbsolute6(prefix))
           prefix = "/" + prefix;
         read = prefix;
       } else
@@ -85394,7 +85427,7 @@ var require_glob = __commonJS({
         this.matches[index] = /* @__PURE__ */ Object.create(null);
       if (!exists2)
         return cb();
-      if (prefix && isAbsolute5(prefix) && !this.nomount) {
+      if (prefix && isAbsolute6(prefix) && !this.nomount) {
         var trail = /[\/\\]$/.test(prefix);
         if (prefix.charAt(0) === "/") {
           prefix = path36.join(this.root, prefix);
@@ -87231,7 +87264,7 @@ var require_util2 = __commonJS({
         }
         path36 = url2.path;
       }
-      var isAbsolute5 = exports2.isAbsolute(path36);
+      var isAbsolute6 = exports2.isAbsolute(path36);
       var parts = [];
       var start2 = 0;
       var i = 0;
@@ -87266,7 +87299,7 @@ var require_util2 = __commonJS({
       }
       path36 = parts.join("/");
       if (path36 === "") {
-        path36 = isAbsolute5 ? "/" : ".";
+        path36 = isAbsolute6 ? "/" : ".";
       }
       if (url2) {
         url2.path = path36;
@@ -87275,7 +87308,7 @@ var require_util2 = __commonJS({
       return path36;
     });
     exports2.normalize = normalize;
-    function join44(aRoot, aPath) {
+    function join45(aRoot, aPath) {
       if (aRoot === "") {
         aRoot = ".";
       }
@@ -87307,7 +87340,7 @@ var require_util2 = __commonJS({
       }
       return joined;
     }
-    exports2.join = join44;
+    exports2.join = join45;
     exports2.isAbsolute = function(aPath) {
       return aPath.charAt(0) === "/" || urlRegexp.test(aPath);
     };
@@ -87521,7 +87554,7 @@ var require_util2 = __commonJS({
             parsed.path = parsed.path.substring(0, index + 1);
           }
         }
-        sourceURL = join44(urlGenerate(parsed), sourceURL);
+        sourceURL = join45(urlGenerate(parsed), sourceURL);
       }
       return normalize(sourceURL);
     }
@@ -98699,7 +98732,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var path35 = __toESM(require("node:path"));
-var import_node_os12 = require("node:os");
+var import_node_os14 = require("node:os");
 
 // ../configuration-core/src/flags.ts
 var fs = __toESM(require("node:fs"), 1);
@@ -103895,7 +103928,7 @@ var ALLOWED = {
   },
   "toolserver:start": {},
   "toolserver:stop": {
-    reason: oneOf(["idle", "signal", "crash"]),
+    reason: oneOf(["idle", "signal", "crash", "deferred"]),
     uptime_ms: DURATION_MS,
     total_tool_calls: COUNT,
     ...FAILURE_SIGNAL2,
@@ -104768,6 +104801,9 @@ function hostPlatformKey() {
   }
   return process.platform;
 }
+function simulatorServerBinaryName() {
+  return process.platform === "win32" ? "simulator-server.exe" : "simulator-server";
+}
 function platformBinDir() {
   return path5.join(BIN_DIR, hostPlatformKey());
 }
@@ -104775,12 +104811,13 @@ function tcpBinDir() {
   return process.env.ARGENT_SIMULATOR_SERVER_TCP_DIR ?? path5.join(BIN_DIR, "tcp");
 }
 function simulatorServerBinaryPath() {
-  const p = path5.join(platformBinDir(), "simulator-server");
+  const binaryName = simulatorServerBinaryName();
+  const p = path5.join(platformBinDir(), binaryName);
   if (!fs3.existsSync(p)) {
-    const flat = path5.join(BIN_DIR, "simulator-server");
+    const flat = path5.join(BIN_DIR, binaryName);
     const migrationHint = fs3.existsSync(flat) ? ` Found a binary at the old flat path ${flat}; move it to ${p} or update ARGENT_SIMULATOR_SERVER_DIR to point at the parent of the platform subdirectory.` : "";
     throw new Error(
-      `simulator-server binary not found for platform "${hostPlatformKey()}" at ${p}. Supported hosts today: darwin, linux (x86_64 and arm64).${migrationHint}`
+      `simulator-server binary not found for platform "${hostPlatformKey()}" at ${p}. Supported hosts today: darwin, linux (x86_64 and arm64), win32.${migrationHint}`
     );
   }
   return p;
@@ -105253,8 +105290,8 @@ var import_express3 = __toESM(require_express2());
 var import_bytes2 = __toESM(require_bytes());
 var import_node_fs11 = require("node:fs");
 var import_promises9 = require("node:fs/promises");
-var import_node_os8 = require("node:os");
-var import_node_path9 = require("node:path");
+var import_node_os9 = require("node:os");
+var import_node_path11 = require("node:path");
 var import_node_crypto6 = require("node:crypto");
 init_src();
 init_src();
@@ -105294,8 +105331,6 @@ function createIdleTimer(timeoutMs, onIdle) {
 }
 
 // ../tool-server/src/utils/check-deps.ts
-var import_node_child_process5 = require("node:child_process");
-var import_node_util4 = require("node:util");
 init_src();
 init_android_binary();
 
@@ -105305,7 +105340,7 @@ var import_node_util3 = require("node:util");
 var import_node_fs5 = require("node:fs");
 var import_promises3 = require("node:fs/promises");
 var import_node_os3 = require("node:os");
-var import_node_path3 = require("node:path");
+var import_node_path4 = require("node:path");
 init_src();
 init_subprocess_error();
 
@@ -105378,6 +105413,7 @@ async function listRunningVvdPids() {
 }
 
 // ../tool-server/src/utils/vega-cli.ts
+init_command_on_path();
 var execFileAsync3 = (0, import_node_util3.promisify)(import_node_child_process4.execFile);
 var VEGA_BINARY_TTL_MS = 6e4;
 var cachedVegaBinary;
@@ -105389,24 +105425,13 @@ async function isExecutable(p) {
     return false;
   }
 }
-async function commandOnPath(name) {
-  try {
-    const { stdout } = await execFileAsync3("/bin/sh", ["-c", `command -v ${name}`], {
-      timeout: 2e3
-    });
-    const path36 = stdout.trim();
-    return path36 || null;
-  } catch {
-    return null;
-  }
-}
 async function resolveVegaBinary() {
   const now = Date.now();
   if (cachedVegaBinary && now - cachedVegaBinary.checkedAt < VEGA_BINARY_TTL_MS) {
     return cachedVegaBinary.path;
   }
   const onPath = await commandOnPath("vega") ?? await commandOnPath("kepler");
-  const fallback = (0, import_node_path3.join)((0, import_node_os3.homedir)(), "vega", "bin", "vega");
+  const fallback = (0, import_node_path4.join)((0, import_node_os3.homedir)(), "vega", "bin", "vega");
   const path36 = onPath ?? (await isExecutable(fallback) ? fallback : null);
   cachedVegaBinary = { path: path36, checkedAt: now };
   return path36;
@@ -105686,7 +105711,7 @@ async function vegaDevice(serial, subcommand, options = {}) {
 }
 
 // ../tool-server/src/utils/check-deps.ts
-var execFileAsync4 = (0, import_node_util4.promisify)(import_node_child_process5.execFile);
+init_command_on_path();
 var DependencyMissingError = class extends Error {
   missing;
   constructor(missing, message) {
@@ -105717,12 +105742,7 @@ async function probe2(dep) {
   if (dep === "vega") {
     return await resolveVegaBinary() !== null;
   }
-  try {
-    await execFileAsync4("/bin/sh", ["-c", `command -v ${dep}`], { timeout: 2e3 });
-    return true;
-  } catch {
-    return false;
-  }
+  return await commandOnPath(dep) !== null;
 }
 async function isAvailable(dep) {
   const now = Date.now();
@@ -105806,7 +105826,7 @@ function toSimulatorNetworkError(toolLabel, err, apiUrl, fallbackHint) {
 // ../tool-server/src/utils/update-checker.ts
 var import_node_fs6 = __toESM(require("node:fs"));
 var import_node_os4 = __toESM(require("node:os"));
-var import_node_path4 = __toESM(require("node:path"));
+var import_node_path5 = __toESM(require("node:path"));
 var import_semver = __toESM(require_semver2());
 
 // ../tool-server/package.json
@@ -105818,7 +105838,7 @@ var PACKAGE_NAME = "@swmansion/argent";
 var REGISTRY_URL = `https://registry.npmjs.org/${PACKAGE_NAME}`;
 var CHECK_INTERVAL_MS = 60 * 60 * 1e3 * 24;
 function getSuppressionFilePath() {
-  return import_node_path4.default.join(import_node_os4.default.homedir(), ".argent", "update-suppression.json");
+  return import_node_path5.default.join(import_node_os4.default.homedir(), ".argent", "update-suppression.json");
 }
 function loadSuppressUntil() {
   try {
@@ -105832,7 +105852,7 @@ function loadSuppressUntil() {
 }
 function persistSuppressUntil(value) {
   const filePath = getSuppressionFilePath();
-  import_node_fs6.default.mkdirSync(import_node_path4.default.dirname(filePath), { recursive: true });
+  import_node_fs6.default.mkdirSync(import_node_path5.default.dirname(filePath), { recursive: true });
   import_node_fs6.default.writeFileSync(filePath, JSON.stringify({ suppressUntil: value }));
 }
 var state2 = {
@@ -105926,12 +105946,12 @@ ACTION REQUIRED: Save a note (via TODO, task list) that an Argent update to v${l
 
 // ../tool-server/src/preview.ts
 var import_node_fs9 = __toESM(require("node:fs"));
-var import_node_os6 = __toESM(require("node:os"));
-var import_node_path6 = __toESM(require("node:path"));
+var import_node_os7 = __toESM(require("node:os"));
+var import_node_path8 = __toESM(require("node:path"));
 var import_express = __toESM(require_express2());
 
 // ../tool-server/src/blueprints/simulator-server.ts
-var import_node_child_process10 = require("node:child_process");
+var import_node_child_process9 = require("node:child_process");
 var readline2 = __toESM(require("node:readline"));
 init_src();
 
@@ -105942,23 +105962,23 @@ var readline = __toESM(require("node:readline"));
 init_src();
 
 // ../tool-server/src/utils/ios-host.ts
-var import_node_child_process9 = require("node:child_process");
+var import_node_child_process8 = require("node:child_process");
 var import_node_events = require("node:events");
 var fs7 = __toESM(require("node:fs"));
 var path8 = __toESM(require("node:path"));
-var import_node_util8 = require("node:util");
+var import_node_util7 = require("node:util");
 
 // ../tool-server/src/utils/simctl-config.ts
 var SIMCTL_SPAWN_TIMEOUT_MS = 1e4;
 var SIMCTL_KILL_SIGNAL = "SIGKILL";
 
 // ../tool-server/src/utils/ios-devices.ts
-var import_node_child_process6 = require("node:child_process");
-var import_node_util5 = require("node:util");
-var execFileAsync5 = (0, import_node_util5.promisify)(import_node_child_process6.execFile);
+var import_node_child_process5 = require("node:child_process");
+var import_node_util4 = require("node:util");
+var execFileAsync4 = (0, import_node_util4.promisify)(import_node_child_process5.execFile);
 async function listIosSimulators() {
   try {
-    const { stdout } = await execFileAsync5("xcrun", ["simctl", "list", "devices", "--json"], {
+    const { stdout } = await execFileAsync4("xcrun", ["simctl", "list", "devices", "--json"], {
       timeout: 1e4,
       killSignal: SIMCTL_KILL_SIGNAL
     });
@@ -106005,11 +106025,11 @@ function getCachedSimulatorRuntimeKind(udid) {
 var fsAsync = __toESM(require("node:fs/promises"));
 var os3 = __toESM(require("node:os"));
 var path7 = __toESM(require("node:path"));
-var import_node_child_process7 = require("node:child_process");
-var import_node_util6 = require("node:util");
-var execFileAsync6 = (0, import_node_util6.promisify)(import_node_child_process7.execFile);
+var import_node_child_process6 = require("node:child_process");
+var import_node_util5 = require("node:util");
+var execFileAsync5 = (0, import_node_util5.promisify)(import_node_child_process6.execFile);
 async function ensureAutomationEnabled(udid) {
-  await execFileAsync6(
+  await execFileAsync5(
     "xcrun",
     [
       "simctl",
@@ -106026,7 +106046,7 @@ async function ensureAutomationEnabled(udid) {
   );
 }
 async function isEntitlementBypassActive(udid) {
-  return execFileAsync6(
+  return execFileAsync5(
     "xcrun",
     [
       "simctl",
@@ -106053,7 +106073,7 @@ async function setAccessibilityPrefsPreBoot(udid) {
   await fsAsync.mkdir(path7.dirname(plistPath), { recursive: true });
   const exists2 = await fsAsync.access(plistPath).then(() => true).catch(() => false);
   if (!exists2) {
-    await execFileAsync6("plutil", ["-create", "binary1", plistPath]);
+    await execFileAsync5("plutil", ["-create", "binary1", plistPath]);
   }
   for (const key of [
     "AutomationEnabled",
@@ -106061,13 +106081,13 @@ async function setAccessibilityPrefsPreBoot(udid) {
     "AccessibilityEnabled",
     "ApplicationAccessibilityEnabled"
   ]) {
-    await execFileAsync6("plutil", ["-replace", key, "-bool", "true", plistPath]);
+    await execFileAsync5("plutil", ["-replace", key, "-bool", "true", plistPath]);
   }
 }
 
 // ../tool-server/src/utils/sim-remote.ts
-var import_node_child_process8 = require("node:child_process");
-var import_node_util7 = require("node:util");
+var import_node_child_process7 = require("node:child_process");
+var import_node_util6 = require("node:util");
 
 // ../tool-server/src/utils/device-info.ts
 var IOS_UDID_SHAPE = /^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$/;
@@ -106107,11 +106127,11 @@ function chromiumIdFromPort(port) {
 }
 
 // ../tool-server/src/utils/sim-remote.ts
-var execFileAsync7 = (0, import_node_util7.promisify)(import_node_child_process8.execFile);
+var execFileAsync6 = (0, import_node_util6.promisify)(import_node_child_process7.execFile);
 var DEFAULT_TIMEOUT_MS = 3e4;
 async function run(args, options) {
   try {
-    const { stdout } = await execFileAsync7("sim-remote", args, {
+    const { stdout } = await execFileAsync6("sim-remote", args, {
       timeout: options?.timeoutMs ?? DEFAULT_TIMEOUT_MS,
       maxBuffer: 16 * 1024 * 1024,
       encoding: "utf8",
@@ -106230,7 +106250,7 @@ async function moqInfo(udid) {
 }
 
 // ../tool-server/src/utils/ios-host.ts
-var execFileAsync8 = (0, import_node_util8.promisify)(import_node_child_process9.execFile);
+var execFileAsync7 = (0, import_node_util7.promisify)(import_node_child_process8.execFile);
 var ARGENT_BOOTSTRAP_DYLIB_BASENAMES = /* @__PURE__ */ new Set([
   "libArgentInjectionBootstrap.dylib",
   "libInjectionBootstrap.dylib"
@@ -106260,7 +106280,7 @@ async function ensureAccessibilityEnabled(udid) {
   const flags = ["AccessibilityEnabled", "ApplicationAccessibilityEnabled"];
   await Promise.all(
     flags.map(
-      (flag) => execFileAsync8(
+      (flag) => execFileAsync7(
         "xcrun",
         [
           "simctl",
@@ -106280,7 +106300,7 @@ async function ensureAccessibilityEnabled(udid) {
 }
 async function setupNativeDevtoolsEnvLocal(udid, endpoint) {
   const bootstrapPath = await isTvOsSimulator(udid) ? bootstrapDylibPathTvos() : endpoint.transport === "tcp" ? bootstrapDylibPathTcp() : bootstrapDylibPath();
-  const result = await execFileAsync8(
+  const result = await execFileAsync7(
     "xcrun",
     ["simctl", "spawn", udid, "launchctl", "getenv", "DYLD_INSERT_LIBRARIES"],
     { encoding: "utf8", timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
@@ -106288,7 +106308,7 @@ async function setupNativeDevtoolsEnvLocal(udid, endpoint) {
   const existing = (result.stdout ?? "").trim();
   const updated = buildDyldInsertLibraries(existing, bootstrapPath);
   if (updated !== existing) {
-    await execFileAsync8(
+    await execFileAsync7(
       "xcrun",
       ["simctl", "spawn", udid, "launchctl", "setenv", "DYLD_INSERT_LIBRARIES", updated],
       { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
@@ -106298,7 +106318,7 @@ async function setupNativeDevtoolsEnvLocal(udid, endpoint) {
     if (endpoint.port === void 0) {
       throw new Error("native-devtools TCP endpoint reached host setup before its port was bound");
     }
-    await execFileAsync8(
+    await execFileAsync7(
       "xcrun",
       [
         "simctl",
@@ -106312,7 +106332,7 @@ async function setupNativeDevtoolsEnvLocal(udid, endpoint) {
       { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
     );
   } else {
-    await execFileAsync8(
+    await execFileAsync7(
       "xcrun",
       [
         "simctl",
@@ -106352,7 +106372,7 @@ function parseUIKitApplicationBundleIds(stdout) {
   return bundleIds;
 }
 async function listRunningUIKitApplicationBundleIds(udid) {
-  const { stdout } = await execFileAsync8("xcrun", ["simctl", "spawn", udid, "launchctl", "list"], {
+  const { stdout } = await execFileAsync7("xcrun", ["simctl", "spawn", udid, "launchctl", "list"], {
     encoding: "utf8",
     timeout: SIMCTL_SPAWN_TIMEOUT_MS,
     killSignal: SIMCTL_KILL_SIGNAL
@@ -106365,7 +106385,7 @@ function spawnAxDaemonLocal(udid, endpoint) {
     throw new Error("ax-service TCP endpoint reached spawn before its port was bound");
   }
   const endpointArgs = endpoint.transport === "tcp" ? ["--port", String(endpoint.port)] : ["--socket", endpoint.socketPath];
-  const proc = (0, import_node_child_process9.execFile)(
+  const proc = (0, import_node_child_process8.execFile)(
     "xcrun",
     ["simctl", "spawn", udid, binaryPath, ...endpointArgs, "--timeout", "3600"],
     { encoding: "utf8" }
@@ -109766,22 +109786,22 @@ var Subscriber = class {
     const broadcast = new Broadcast();
     void (async () => {
       for (; ; ) {
-        const request2 = await broadcast.requested();
-        if (!request2)
+        const request3 = await broadcast.requested();
+        if (!request3)
           break;
-        void this.#runSubscribe(path36, request2);
+        void this.#runSubscribe(path36, request3);
       }
     })();
     return broadcast;
   }
-  async #runSubscribe(broadcast, request2) {
+  async #runSubscribe(broadcast, request3) {
     const version4 = this.#session.version;
     const requestId = await this.#session.nextRequestId();
     if (requestId === void 0) {
-      request2.track.close(new Error("session closed"));
+      request3.track.close(new Error("session closed"));
       return;
     }
-    console.debug(`subscribe start: id=${requestId} broadcast=${broadcast} track=${request2.track.name}`);
+    console.debug(`subscribe start: id=${requestId} broadcast=${broadcast} track=${request3.track.name}`);
     try {
       const stream = await this.#session.openBi();
       try {
@@ -109789,22 +109809,22 @@ var Subscriber = class {
         const msg = new Subscribe({
           requestId,
           trackNamespace: broadcast,
-          trackName: request2.track.name,
-          subscriberPriority: request2.priority
+          trackName: request3.track.name,
+          subscriberPriority: request3.priority
         });
         await msg.encode(stream.writer, version4);
-        console.debug(`subscribe written: id=${requestId} broadcast=${broadcast} track=${request2.track.name}`);
-        this.#subscribes.set(requestId, request2.track);
+        console.debug(`subscribe written: id=${requestId} broadcast=${broadcast} track=${request3.track.name}`);
+        this.#subscribes.set(requestId, request3.track);
         const respTypeId = await stream.reader.u53();
         if (respTypeId === SubscribeOk.id) {
           const ok = await SubscribeOk.decode(stream.reader, version4);
           if (ok.trackAlias !== requestId) {
             this.#subscribes.delete(requestId);
-            this.#subscribes.set(ok.trackAlias, request2.track);
+            this.#subscribes.set(ok.trackAlias, request3.track);
           }
-          console.debug(`subscribe ok: id=${requestId} broadcast=${broadcast} track=${request2.track.name}`);
+          console.debug(`subscribe ok: id=${requestId} broadcast=${broadcast} track=${request3.track.name}`);
           try {
-            await Promise.race([stream.reader.closed, request2.track.closed]);
+            await Promise.race([stream.reader.closed, request3.track.closed]);
             if (version4 === Version.DRAFT_14 || version4 === Version.DRAFT_15 || version4 === Version.DRAFT_16) {
               try {
                 await stream.writer.u53(Unsubscribe.id);
@@ -109813,9 +109833,9 @@ var Subscriber = class {
               } catch {
               }
             }
-            request2.track.close();
+            request3.track.close();
             stream.close();
-            console.debug(`subscribe close: id=${requestId} broadcast=${broadcast} track=${request2.track.name}`);
+            console.debug(`subscribe close: id=${requestId} broadcast=${broadcast} track=${request3.track.name}`);
           } finally {
             this.#subscribes.delete(ok.trackAlias);
           }
@@ -109838,8 +109858,8 @@ var Subscriber = class {
       }
     } catch (err) {
       const e = error51(err);
-      request2.track.close(e);
-      console.warn(`subscribe error: id=${requestId} broadcast=${broadcast} track=${request2.track.name} error=${e.message}`);
+      request3.track.close(e);
+      console.warn(`subscribe error: id=${requestId} broadcast=${broadcast} track=${request3.track.name} error=${e.message}`);
     }
   }
   /**
@@ -111381,19 +111401,19 @@ var Subscriber2 = class {
     const broadcast = new Broadcast();
     void (async () => {
       for (; ; ) {
-        const request2 = await broadcast.requested();
-        if (!request2)
+        const request3 = await broadcast.requested();
+        if (!request3)
           break;
-        void this.#runSubscribe(path36, request2);
+        void this.#runSubscribe(path36, request3);
       }
     })();
     return broadcast;
   }
-  async #runSubscribe(broadcast, request2) {
+  async #runSubscribe(broadcast, request3) {
     const id = this.#subscribeNext++;
-    this.#subscribes.set(id, request2.track);
-    console.debug(`subscribe start: id=${id} broadcast=${broadcast} track=${request2.track.name}`);
-    const msg = new Subscribe2({ id, broadcast, track: request2.track.name, priority: request2.priority });
+    this.#subscribes.set(id, request3.track);
+    console.debug(`subscribe start: id=${id} broadcast=${broadcast} track=${request3.track.name}`);
+    const msg = new Subscribe2({ id, broadcast, track: request3.track.name, priority: request3.priority });
     const stream = await Stream.open(this.#quic);
     await stream.writer.u53(StreamId.Subscribe);
     await msg.encode(stream.writer, this.version);
@@ -111402,24 +111422,24 @@ var Subscriber2 = class {
       if (!("ok" in resp)) {
         throw new Error("first subscribe response must be SUBSCRIBE_OK");
       }
-      console.debug(`subscribe ok: id=${id} broadcast=${broadcast} track=${request2.track.name}`);
-      const waits = [stream.reader.closed, request2.track.closed];
+      console.debug(`subscribe ok: id=${id} broadcast=${broadcast} track=${request3.track.name}`);
+      const waits = [stream.reader.closed, request3.track.closed];
       switch (this.version) {
         case Version2.DRAFT_01:
         case Version2.DRAFT_02:
           break;
         default:
-          waits.push(this.#runPriorityUpdates(id, broadcast, request2.track, msg, stream));
+          waits.push(this.#runPriorityUpdates(id, broadcast, request3.track, msg, stream));
           break;
       }
       await Promise.race(waits);
-      request2.track.close();
+      request3.track.close();
       stream.close();
-      console.debug(`subscribe close: id=${id} broadcast=${broadcast} track=${request2.track.name}`);
+      console.debug(`subscribe close: id=${id} broadcast=${broadcast} track=${request3.track.name}`);
     } catch (err) {
       const e = error51(err);
-      request2.track.close(e);
-      console.warn(`subscribe error: id=${id} broadcast=${broadcast} track=${request2.track.name} error=${e.message}`);
+      request3.track.close(e);
+      console.warn(`subscribe error: id=${id} broadcast=${broadcast} track=${request3.track.name} error=${e.message}`);
       stream.abort(e);
     } finally {
       this.#subscribes.delete(id);
@@ -114151,7 +114171,7 @@ function spawnSimulatorServerProcess(udid, subcommand) {
   const { BINARY_PATH, BINARY_DIR } = getPaths();
   return new Promise((resolve7, reject) => {
     const args = [subcommand, "--id", udid];
-    const proc = (0, import_node_child_process10.spawn)(BINARY_PATH, args, {
+    const proc = (0, import_node_child_process9.spawn)(BINARY_PATH, args, {
       cwd: BINARY_DIR,
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -114368,9 +114388,10 @@ function classifyDeviceForTelemetry(deviceId) {
 }
 
 // ../tool-server/src/utils/device-shutdown.ts
-var import_node_child_process12 = require("node:child_process");
-var import_node_util10 = require("node:util");
-var execFileAsync10 = (0, import_node_util10.promisify)(import_node_child_process12.execFile);
+var import_node_child_process11 = require("node:child_process");
+var import_node_util9 = require("node:util");
+init_android_binary();
+var execFileAsync9 = (0, import_node_util9.promisify)(import_node_child_process11.execFile);
 async function shutdownOwnedDevice(id) {
   let platform;
   try {
@@ -114379,10 +114400,11 @@ async function shutdownOwnedDevice(id) {
     return;
   }
   if (platform === "ios") {
-    await execFileAsync10("xcrun", ["simctl", "shutdown", id]).catch(() => {
+    await execFileAsync9("xcrun", ["simctl", "shutdown", id]).catch(() => {
     });
   } else if (platform === "android") {
-    await execFileAsync10("adb", ["-s", id, "emu", "kill"]).catch(() => {
+    const adb = await resolveAndroidBinary("adb") ?? "adb";
+    await execFileAsync9(adb, ["-s", id, "emu", "kill"]).catch(() => {
     });
   }
 }
@@ -114398,11 +114420,12 @@ async function shutdownDevice(id) {
   }
   try {
     if (device.platform === "ios") {
-      await execFileAsync10("xcrun", ["simctl", "shutdown", id]);
+      await execFileAsync9("xcrun", ["simctl", "shutdown", id]);
       return { ok: true };
     }
     if (device.platform === "android" && device.kind === "emulator") {
-      await execFileAsync10("adb", ["-s", id, "emu", "kill"]);
+      const adb = await resolveAndroidBinary("adb") ?? "adb";
+      await execFileAsync9(adb, ["-s", id, "emu", "kill"]);
       return { ok: true };
     }
     return {
@@ -115974,12 +115997,12 @@ init_src();
 // ../tool-server/src/utils/vega-sdk.ts
 var import_promises4 = require("node:fs/promises");
 var import_node_fs7 = require("node:fs");
-var import_node_os5 = require("node:os");
-var import_node_path5 = require("node:path");
+var import_node_os6 = require("node:os");
+var import_node_path7 = require("node:path");
 var import_semver2 = __toESM(require_semver2());
 async function readVegaConfig() {
   try {
-    const raw = await (0, import_promises4.readFile)((0, import_node_path5.join)((0, import_node_os5.homedir)(), "vega", "config.json"), "utf-8");
+    const raw = await (0, import_promises4.readFile)((0, import_node_path7.join)((0, import_node_os6.homedir)(), "vega", "config.json"), "utf-8");
     return JSON.parse(raw);
   } catch {
     return {};
@@ -115990,13 +116013,13 @@ function bareVersion(version4) {
 }
 function sdkComponentRoots(config2) {
   const roots = [
-    config2.sdkPath && (0, import_node_path5.join)(config2.sdkPath, "vega-sdk"),
-    (0, import_node_path5.join)((0, import_node_os5.homedir)(), "vega", "sdk", "vega-sdk")
+    config2.sdkPath && (0, import_node_path7.join)(config2.sdkPath, "vega-sdk"),
+    (0, import_node_path7.join)((0, import_node_os6.homedir)(), "vega", "sdk", "vega-sdk")
   ].filter((p) => Boolean(p));
   return Array.from(new Set(roots));
 }
 async function resolveVersion(channelDir, preferred) {
-  if (preferred && (0, import_node_fs7.existsSync)((0, import_node_path5.join)(channelDir, preferred))) return preferred;
+  if (preferred && (0, import_node_fs7.existsSync)((0, import_node_path7.join)(channelDir, preferred))) return preferred;
   try {
     const versions = (await (0, import_promises4.readdir)(channelDir)).filter((e) => import_semver2.default.valid(e)).sort(import_semver2.default.rcompare);
     return versions[0] ?? null;
@@ -116010,10 +116033,10 @@ async function resolveVegaSdkImagesDir() {
   const channel = config2.defaultChannel || "main";
   const preferred = bareVersion(config2.defaultVersion);
   for (const root2 of sdkComponentRoots(config2)) {
-    const channelDir = (0, import_node_path5.join)(root2, channel);
+    const channelDir = (0, import_node_path7.join)(root2, channel);
     const version4 = await resolveVersion(channelDir, preferred);
     if (!version4) continue;
-    const imagesDir = (0, import_node_path5.join)(channelDir, version4, "vvd", "images");
+    const imagesDir = (0, import_node_path7.join)(channelDir, version4, "vvd", "images");
     if ((0, import_node_fs7.existsSync)(imagesDir)) return imagesDir;
   }
   return null;
@@ -116023,7 +116046,7 @@ async function listVvdImages() {
   if (!dir) return [];
   try {
     const entries = await (0, import_promises4.readdir)(dir, { withFileTypes: true });
-    return entries.filter((e) => e.isDirectory()).map((e) => ({ name: e.name, path: (0, import_node_path5.join)(dir, e.name) })).sort((a, b) => a.name.localeCompare(b.name));
+    return entries.filter((e) => e.isDirectory()).map((e) => ({ name: e.name, path: (0, import_node_path7.join)(dir, e.name) })).sort((a, b) => a.name.localeCompare(b.name));
   } catch {
     return [];
   }
@@ -117956,7 +117979,7 @@ function parseUiAutomatorDump(rawOutput, screenW, screenH, options = {}) {
 }
 
 // ../tool-server/src/blueprints/android-devtools.ts
-var import_node_child_process13 = require("node:child_process");
+var import_node_child_process12 = require("node:child_process");
 var readline5 = __toESM(require("node:readline"));
 init_src();
 
@@ -118515,7 +118538,7 @@ async function spawnHelper(serial) {
       }
     );
   }
-  const proc = (0, import_node_child_process13.spawn)(
+  const proc = (0, import_node_child_process12.spawn)(
     adbPath,
     ["-s", serial, "shell", "am", "instrument", "-w", manifest.instrumentationRunner],
     { stdio: ["ignore", "pipe", "pipe"] }
@@ -118817,9 +118840,9 @@ async function describeAndroid(registry2, serial, _bundleId, isTv) {
 // ../tool-server/src/preview.ts
 function findUiFile(name) {
   const candidates = [
-    import_node_path6.default.join(__dirname, "preview-ui", name),
-    import_node_path6.default.resolve(__dirname, "..", "..", "..", "ui", name),
-    import_node_path6.default.resolve(__dirname, "..", "..", "ui", name)
+    import_node_path8.default.join(__dirname, "preview-ui", name),
+    import_node_path8.default.resolve(__dirname, "..", "..", "..", "ui", name),
+    import_node_path8.default.resolve(__dirname, "..", "..", "ui", name)
   ];
   for (const p of candidates) {
     if (import_node_fs9.default.existsSync(p)) return p;
@@ -118828,7 +118851,7 @@ function findUiFile(name) {
 }
 function serveUiFile(res, filePath, contentType) {
   res.set("Cache-Control", "no-store, must-revalidate");
-  res.type(contentType).sendFile(import_node_path6.default.basename(filePath), { root: import_node_path6.default.dirname(filePath) });
+  res.type(contentType).sendFile(import_node_path8.default.basename(filePath), { root: import_node_path8.default.dirname(filePath) });
 }
 function wsUrlFromHttp(httpUrl2) {
   const u = new URL(httpUrl2);
@@ -119143,7 +119166,7 @@ data: ${JSON.stringify(data)}
   const MAX_PREVIEW_BYTES = 25 * 1024 * 1024;
   const allowedRoots = (() => {
     const roots = /* @__PURE__ */ new Set();
-    for (const r of [import_node_os6.default.tmpdir(), process.cwd(), "/tmp"]) {
+    for (const r of [import_node_os7.default.tmpdir(), process.cwd(), "/tmp"]) {
       try {
         roots.add(import_node_fs9.default.realpathSync(r));
       } catch {
@@ -119173,9 +119196,9 @@ data: ${JSON.stringify(data)}
       return;
     }
     const contained = allowedRoots.some(
-      (root2) => real === root2 || real.startsWith(root2 + import_node_path6.default.sep)
+      (root2) => real === root2 || real.startsWith(root2 + import_node_path8.default.sep)
     );
-    const mime = IMG_MIME[import_node_path6.default.extname(real).toLowerCase()];
+    const mime = IMG_MIME[import_node_path8.default.extname(real).toLowerCase()];
     if (!contained || !mime || size > MAX_PREVIEW_BYTES) {
       res.status(404).end();
       return;
@@ -119236,18 +119259,18 @@ data: ${JSON.stringify(data)}
 // ../tool-server/src/artifacts.ts
 var import_node_fs10 = require("node:fs");
 var import_promises7 = require("node:fs/promises");
-var import_node_child_process15 = require("node:child_process");
+var import_node_child_process14 = require("node:child_process");
 
 // ../archive/src/index.ts
-var import_node_child_process14 = require("node:child_process");
+var import_node_child_process13 = require("node:child_process");
 var import_promises6 = require("node:fs/promises");
-var import_node_path7 = require("node:path");
-var import_node_util11 = require("node:util");
-var execFileAsync11 = (0, import_node_util11.promisify)(import_node_child_process14.execFile);
+var import_node_path9 = require("node:path");
+var import_node_util10 = require("node:util");
+var execFileAsync10 = (0, import_node_util10.promisify)(import_node_child_process13.execFile);
 var ArchiveError = class extends Error {
 };
 function createTarGzArgs(sourcePath, target) {
-  return ["-czf", target, "-C", (0, import_node_path7.dirname)(sourcePath), (0, import_node_path7.basename)(sourcePath)];
+  return ["-czf", target, "-C", (0, import_node_path9.dirname)(sourcePath), (0, import_node_path9.basename)(sourcePath)];
 }
 function normalizeTarMemberPath(memberPath) {
   return memberPath.replace(/^\.\//, "").replace(/\\/g, "/");
@@ -119256,24 +119279,24 @@ function isSafeTarMember(memberPath, destDir) {
   const normalized = normalizeTarMemberPath(memberPath);
   if (!normalized || normalized === "." || normalized === "./") return false;
   if (normalized.startsWith("/") || /^[A-Za-z]:[\\/]/.test(normalized)) return false;
-  const relative4 = import_node_path7.posix.normalize(normalized);
+  const relative4 = import_node_path9.posix.normalize(normalized);
   if (relative4 === ".." || relative4.startsWith("../") || relative4.split("/").includes("..")) {
     return false;
   }
-  const root2 = (0, import_node_path7.resolve)(destDir);
-  const resolved = (0, import_node_path7.resolve)(destDir, relative4);
-  return resolved === root2 || resolved.startsWith(root2 + import_node_path7.sep);
+  const root2 = (0, import_node_path9.resolve)(destDir);
+  const resolved = (0, import_node_path9.resolve)(destDir, relative4);
+  return resolved === root2 || resolved.startsWith(root2 + import_node_path9.sep);
 }
 async function listTarMembers(tarPath) {
-  const { stdout } = await execFileAsync11("tar", ["-tzf", tarPath]);
+  const { stdout } = await execFileAsync10("tar", ["-tzf", tarPath]);
   return stdout.split("\n").map((line) => line.trim()).filter((line) => line.length > 0);
 }
 function isEscapingLinkTarget(target) {
   if (target.startsWith("/") || /^[A-Za-z]:[\\/]/.test(target)) return true;
-  return import_node_path7.posix.normalize(target.replace(/\\/g, "/")).split("/").includes("..");
+  return import_node_path9.posix.normalize(target.replace(/\\/g, "/")).split("/").includes("..");
 }
 async function assertSafeMemberTypes(tarPath) {
-  const { stdout } = await execFileAsync11("tar", ["-tzvf", tarPath]);
+  const { stdout } = await execFileAsync10("tar", ["-tzvf", tarPath]);
   for (const line of stdout.split("\n")) {
     if (!line.trim()) continue;
     const type = line[0];
@@ -119315,7 +119338,7 @@ async function assertSafeArchive(tarPath, destDir) {
 async function resolveMember(destDir, expectedName) {
   const entries = await (0, import_promises6.readdir)(destDir);
   if (entries.includes(expectedName)) {
-    return (0, import_node_path7.join)(destDir, expectedName);
+    return (0, import_node_path9.join)(destDir, expectedName);
   }
   const real = entries.filter((e) => !e.startsWith("._"));
   if (real.length !== 1) {
@@ -119323,11 +119346,11 @@ async function resolveMember(destDir, expectedName) {
       `Could not identify the extracted member (expected "${expectedName}", found ${real.length} entries).`
     );
   }
-  return (0, import_node_path7.join)(destDir, real[0]);
+  return (0, import_node_path9.join)(destDir, real[0]);
 }
 async function safeExtractTarGz(tarPath, destDir, expectedName) {
   await assertSafeArchive(tarPath, destDir);
-  await execFileAsync11("tar", ["-xzf", tarPath, "-C", destDir]);
+  await execFileAsync10("tar", ["-xzf", tarPath, "-C", destDir]);
   return resolveMember(destDir, expectedName);
 }
 
@@ -119379,7 +119402,7 @@ function makeArtifactListRoute(registry2) {
 function streamDirectoryAsTarGz(id, entry, res) {
   res.setHeader("Content-Type", "application/gzip");
   res.setHeader("Content-Disposition", `attachment; filename="${entry.filename}.tar.gz"`);
-  const child = (0, import_node_child_process15.spawn)("tar", createTarGzArgs(entry.path, "-"), {
+  const child = (0, import_node_child_process14.spawn)("tar", createTarGzArgs(entry.path, "-"), {
     stdio: ["ignore", "pipe", "ignore"]
   });
   child.on("error", (err) => {
@@ -119399,8 +119422,8 @@ function streamDirectoryAsTarGz(id, entry, res) {
 
 // ../tool-server/src/file-inputs.ts
 var import_promises8 = require("node:fs/promises");
-var import_node_os7 = require("node:os");
-var import_node_path8 = require("node:path");
+var import_node_os8 = require("node:os");
+var import_node_path10 = require("node:path");
 var import_bytes = __toESM(require_bytes());
 init_src();
 var MAX_UPLOAD_BYTES = 32 * 1024 * 1024;
@@ -119453,8 +119476,8 @@ async function materializeUpload(wire) {
       `Uploaded content for "${wire.path}" is ${data.length} bytes but the client recorded ${wire.size} \u2014 refusing a truncated or corrupted upload.`
     );
   }
-  const dir = await (0, import_promises8.mkdtemp)((0, import_node_path8.join)((0, import_node_os7.tmpdir)(), "argent-file-input-"));
-  const filePath = (0, import_node_path8.join)(dir, sanitizeFilename((0, import_node_path8.basename)(wire.path)));
+  const dir = await (0, import_promises8.mkdtemp)((0, import_node_path10.join)((0, import_node_os8.tmpdir)(), "argent-file-input-"));
+  const filePath = (0, import_node_path10.join)(dir, sanitizeFilename((0, import_node_path10.basename)(wire.path)));
   await (0, import_promises8.writeFile)(filePath, data);
   return { filePath, dir };
 }
@@ -119477,10 +119500,10 @@ async function extractTarUpload(wire, uploadId, meta3, tempDirs, lookupUpload) {
       );
     }
     const extractDir = await (0, import_promises8.mkdtemp)(
-      (0, import_node_path8.join)((0, import_node_os7.tmpdir)(), `argent-tar-upload-${entry.sha256.slice(0, 16)}-`)
+      (0, import_node_path10.join)((0, import_node_os8.tmpdir)(), `argent-tar-upload-${entry.sha256.slice(0, 16)}-`)
     );
     tempDirs.push(extractDir);
-    const uploaded = await safeExtractTarGz(entry.tarPath, extractDir, (0, import_node_path8.basename)(wire.path));
+    const uploaded = await safeExtractTarGz(entry.tarPath, extractDir, (0, import_node_path10.basename)(wire.path));
     return { value: uploaded, meta: { ...meta3, viaUpload: true } };
   } catch (err) {
     if (err instanceof FileInputError) throw err;
@@ -120028,7 +120051,7 @@ function createHttpApp(registry2, options) {
       return;
     }
     const id = (0, import_node_crypto6.randomUUID)();
-    const tarPath = (0, import_node_path9.join)((0, import_node_os8.tmpdir)(), `argent-upload-${id}.tar.gz`);
+    const tarPath = (0, import_node_path11.join)((0, import_node_os9.tmpdir)(), `argent-upload-${id}.tar.gz`);
     const ws = (0, import_node_fs11.createWriteStream)(tarPath);
     let received = 0;
     let released = false;
@@ -120368,12 +120391,12 @@ function createHttpApp(registry2, options) {
 // ../tool-server/src/event-log.ts
 var import_bunyan = __toESM(require_bunyan());
 var import_node_fs12 = require("node:fs");
-var import_node_path10 = require("node:path");
+var import_node_path12 = require("node:path");
 init_src();
 function createToolServerEventLog({
   filePath
 }) {
-  (0, import_node_fs12.mkdirSync)((0, import_node_path10.dirname)(filePath), { recursive: true });
+  (0, import_node_fs12.mkdirSync)((0, import_node_path12.dirname)(filePath), { recursive: true });
   (0, import_node_fs12.writeFileSync)(filePath, "");
   const fileStream = (0, import_node_fs12.createWriteStream)(filePath, { flags: "a" });
   let disposed = false;
@@ -121036,7 +121059,7 @@ var chromiumJsRuntimeDebuggerBlueprint = {
 // ../tool-server/src/blueprints/tv-control.ts
 var net4 = __toESM(require("node:net"));
 var fs17 = __toESM(require("node:fs"));
-var import_node_child_process16 = require("node:child_process");
+var import_node_child_process15 = require("node:child_process");
 init_src();
 var TV_CONTROL_NAMESPACE = "TvControl";
 function tvControlRef(device) {
@@ -121092,7 +121115,7 @@ async function sendJson(socketPath, command, timeoutMs) {
   }
 }
 function spawnAxDaemon(udid, socketPath) {
-  const proc = (0, import_node_child_process16.execFile)(
+  const proc = (0, import_node_child_process15.execFile)(
     "xcrun",
     [
       "simctl",
@@ -121111,7 +121134,7 @@ function spawnAxDaemon(udid, socketPath) {
   return proc;
 }
 function spawnHidDaemon(udid, socketPath) {
-  const proc = (0, import_node_child_process16.execFile)(
+  const proc = (0, import_node_child_process15.execFile)(
     tvosHidDaemonBinaryPath(),
     ["--udid", udid, "--socket", socketPath, "--timeout", "3600"],
     { encoding: "utf8" }
@@ -123576,16 +123599,19 @@ function clearCachedProfilerPaths(port, deviceId) {
 }
 
 // ../tool-server/src/tools/devices/boot-device.ts
-var import_node_child_process18 = require("node:child_process");
-var import_node_util12 = require("node:util");
+var import_node_child_process17 = require("node:child_process");
+var import_node_fs13 = require("node:fs");
+var import_node_os11 = require("node:os");
+var import_node_path14 = require("node:path");
+var import_node_util11 = require("node:util");
 init_zod();
 init_src();
 init_adb();
 
 // ../tool-server/src/utils/linux-preflight.ts
 var fs19 = __toESM(require("node:fs"));
-var import_node_os9 = require("node:os");
-var import_node_path11 = require("node:path");
+var import_node_os10 = require("node:os");
+var import_node_path13 = require("node:path");
 var import_ini2 = __toESM(require_ini());
 function linuxBootDiagnostics(avdName) {
   if (process.platform !== "linux") return null;
@@ -123613,7 +123639,7 @@ function checkKvm() {
 var MIN_RAM_MB = 4096;
 var MIN_HEAP_MB = 512;
 function checkAvdSizing(avdName) {
-  const configPath = (0, import_node_path11.join)((0, import_node_os9.homedir)(), ".android", "avd", `${avdName}.avd`, "config.ini");
+  const configPath = (0, import_node_path13.join)((0, import_node_os10.homedir)(), ".android", "avd", `${avdName}.avd`, "config.ini");
   let content;
   try {
     content = fs19.readFileSync(configPath, "utf8");
@@ -123779,7 +123805,7 @@ async function waitForVvdRunning(timeoutMs) {
 }
 
 // ../tool-server/src/tools/devices/boot-electron.ts
-var import_node_child_process17 = require("node:child_process");
+var import_node_child_process16 = require("node:child_process");
 var fs20 = __toESM(require("node:fs"));
 var net5 = __toESM(require("node:net"));
 var path18 = __toESM(require("node:path"));
@@ -123942,7 +123968,7 @@ async function bootElectronApp(options) {
   const args = [...launcher.args, `--remote-debugging-port=${port}`, ...extra];
   let child;
   try {
-    child = (0, import_node_child_process17.spawn)(launcher.command, args, {
+    child = (0, import_node_child_process16.spawn)(launcher.command, args, {
       detached: true,
       stdio: ["ignore", "pipe", "pipe"],
       // Strip ELECTRON_RUN_AS_NODE (see electronGuiChildEnv): if the tool-server
@@ -124062,7 +124088,7 @@ async function bootElectronApp(options) {
 }
 
 // ../tool-server/src/tools/devices/boot-device.ts
-var execFileAsync12 = (0, import_node_util12.promisify)(import_node_child_process18.execFile);
+var execFileAsync11 = (0, import_node_util11.promisify)(import_node_child_process17.execFile);
 var zodSchema9 = external_exports.object({
   udid: external_exports.string().optional().describe(
     "iOS: simulator UDID to boot (from `list-devices`). Provide exactly one of `udid`, `avdName`, `vvdImage`, or `electronAppPath`."
@@ -124272,7 +124298,7 @@ async function bootIos(udid, registry2, force, headless) {
   const simState = simMatch?.state;
   const isTvOs = simMatch?.runtimeKind === "tv";
   if (force && simState === "Booted") {
-    await execFileAsync12("xcrun", ["simctl", "shutdown", udid]);
+    await execFileAsync11("xcrun", ["simctl", "shutdown", udid]);
   }
   const needsPreBoot = simState === "Shutdown" || force && simState === "Booted";
   if (needsPreBoot) {
@@ -124283,13 +124309,13 @@ async function bootIos(udid, registry2, force, headless) {
       );
     });
   }
-  await execFileAsync12("xcrun", ["simctl", "boot", udid]).catch((err) => {
+  await execFileAsync11("xcrun", ["simctl", "boot", udid]).catch((err) => {
     const message = err instanceof Error ? err.message : String(err);
     if (!message.includes("Unable to boot device in current state: Booted")) {
       throw err;
     }
   });
-  await execFileAsync12("xcrun", ["simctl", "bootstatus", udid, "-b"]);
+  await execFileAsync11("xcrun", ["simctl", "bootstatus", udid, "-b"]);
   if (isTvOs && needsPreBoot) {
     await registry2.disposeService(`${TV_CONTROL_NAMESPACE}:${udid}`).catch((err) => {
       if (err instanceof ServiceNotFoundError) return;
@@ -124316,7 +124342,7 @@ async function bootIos(udid, registry2, force, headless) {
   if (initFailure?.givenUp) {
     return buildInitFailedResult(udid, initFailure);
   }
-  await execFileAsync12("defaults", [
+  await execFileAsync11("defaults", [
     "write",
     "com.apple.iphonesimulator",
     "CurrentDeviceUDID",
@@ -124324,7 +124350,7 @@ async function bootIos(udid, registry2, force, headless) {
   ]).catch(() => {
   });
   if (!headless && !iosHeadlessFromEnv()) {
-    await execFileAsync12("open", ["-a", "Simulator.app"]).catch(() => execFileAsync12("open", ["-b", "com.apple.dt.Devices"])).catch(() => {
+    await execFileAsync11("open", ["-a", "Simulator.app"]).catch(() => execFileAsync11("open", ["-b", "com.apple.dt.Devices"])).catch(() => {
     });
   }
   return { platform: "ios", udid, booted: true };
@@ -124363,11 +124389,25 @@ async function bootIosRemote(id, registry2, force) {
 }
 var HOT_BOOT_BUDGET_MS = 9e4;
 async function attemptBoot(params) {
-  const child = (0, import_node_child_process18.spawn)(params.emulatorBinary, params.emulatorArgs, {
+  let emulatorLogFd;
+  let stdio = "ignore";
+  if (process.platform === "win32") {
+    const safeName = params.avdName.replace(/[^\w.-]/g, "_");
+    const logPath = (0, import_node_path14.join)((0, import_node_os11.tmpdir)(), `argent-emulator-${safeName}.log`);
+    emulatorLogFd = (0, import_node_fs13.openSync)(logPath, "w");
+    stdio = ["ignore", emulatorLogFd, emulatorLogFd];
+  }
+  const child = (0, import_node_child_process17.spawn)(params.emulatorBinary, params.emulatorArgs, {
     detached: true,
-    stdio: "ignore"
+    stdio
   });
   child.unref();
+  if (emulatorLogFd !== void 0) {
+    try {
+      (0, import_node_fs13.closeSync)(emulatorLogFd);
+    } catch {
+    }
+  }
   let earlyExitError = null;
   child.on("exit", (code, signal) => {
     if (signal) {
@@ -124935,10 +124975,10 @@ function dispatchByPlatform(opts) {
 }
 
 // ../tool-server/src/tools/launch-app/platforms/ios.ts
-var import_node_child_process19 = require("node:child_process");
-var import_node_util13 = require("node:util");
+var import_node_child_process18 = require("node:child_process");
+var import_node_util12 = require("node:util");
 init_src();
-var execFileAsync13 = (0, import_node_util13.promisify)(import_node_child_process19.execFile);
+var execFileAsync12 = (0, import_node_util12.promisify)(import_node_child_process18.execFile);
 function makeIosImpl(registry2) {
   return {
     requires: ["xcrun"],
@@ -124951,7 +124991,7 @@ function makeIosImpl(registry2) {
       const blocked = await precheckNativeDevtools(nativeDevtools, params.udid);
       if (blocked) return blocked;
       try {
-        await execFileAsync13("xcrun", ["simctl", "launch", params.udid, params.bundleId]);
+        await execFileAsync12("xcrun", ["simctl", "launch", params.udid, params.bundleId]);
       } catch (err) {
         throw new FailureError(
           `Failed to launch iOS app ${params.bundleId} on ${params.udid}.`,
@@ -124971,9 +125011,9 @@ function makeIosImpl(registry2) {
 }
 
 // ../tool-server/src/utils/simctl-backend.ts
-var import_node_child_process20 = require("node:child_process");
-var import_node_util14 = require("node:util");
-var execFileAsync14 = (0, import_node_util14.promisify)(import_node_child_process20.execFile);
+var import_node_child_process19 = require("node:child_process");
+var import_node_util13 = require("node:util");
+var execFileAsync13 = (0, import_node_util13.promisify)(import_node_child_process19.execFile);
 var remoteSimctl = {
   launch: simctlLaunch,
   terminate: simctlTerminate
@@ -125173,10 +125213,10 @@ Common Android packages: com.android.settings, com.android.chrome, com.google.an
 init_zod();
 
 // ../tool-server/src/tools/restart-app/platforms/ios.ts
-var import_node_child_process21 = require("node:child_process");
-var import_node_util15 = require("node:util");
+var import_node_child_process20 = require("node:child_process");
+var import_node_util14 = require("node:util");
 init_src();
-var execFileAsync15 = (0, import_node_util15.promisify)(import_node_child_process21.execFile);
+var execFileAsync14 = (0, import_node_util14.promisify)(import_node_child_process20.execFile);
 function makeIosImpl2(registry2) {
   return {
     requires: ["xcrun"],
@@ -125190,11 +125230,11 @@ function makeIosImpl2(registry2) {
       const blocked = await precheckNativeDevtools(nativeDevtools, udid);
       if (blocked) return blocked;
       try {
-        await execFileAsync15("xcrun", ["simctl", "terminate", udid, bundleId]);
+        await execFileAsync14("xcrun", ["simctl", "terminate", udid, bundleId]);
       } catch {
       }
       try {
-        await execFileAsync15("xcrun", ["simctl", "launch", udid, bundleId]);
+        await execFileAsync14("xcrun", ["simctl", "launch", udid, bundleId]);
       } catch (err) {
         throw new FailureError(
           `Failed to restart iOS app ${bundleId} on ${udid}.`,
@@ -125351,22 +125391,22 @@ Returns { restarted, bundleId }. Fails if the app is not installed.`,
 init_zod();
 
 // ../tool-server/src/tools/reinstall-app/platforms/ios.ts
-var import_node_child_process22 = require("node:child_process");
-var import_node_util16 = require("node:util");
-var import_node_path12 = require("node:path");
+var import_node_child_process21 = require("node:child_process");
+var import_node_util15 = require("node:util");
+var import_node_path15 = require("node:path");
 init_src();
-var execFileAsync16 = (0, import_node_util16.promisify)(import_node_child_process22.execFile);
+var execFileAsync15 = (0, import_node_util15.promisify)(import_node_child_process21.execFile);
 var iosImpl = {
   requires: ["xcrun"],
   handler: async (_services, params) => {
     const { udid, bundleId, appPath } = params;
-    const absolute = (0, import_node_path12.resolve)(appPath);
+    const absolute = (0, import_node_path15.resolve)(appPath);
     try {
-      await execFileAsync16("xcrun", ["simctl", "uninstall", udid, bundleId]);
+      await execFileAsync15("xcrun", ["simctl", "uninstall", udid, bundleId]);
     } catch {
     }
     try {
-      await execFileAsync16("xcrun", ["simctl", "install", udid, absolute]);
+      await execFileAsync15("xcrun", ["simctl", "install", udid, absolute]);
     } catch (err) {
       throw new FailureError(
         `Failed to install iOS app bundle on ${udid}.`,
@@ -125385,14 +125425,14 @@ var iosImpl = {
 };
 
 // ../tool-server/src/tools/reinstall-app/platforms/android.ts
-var import_node_path13 = require("node:path");
+var import_node_path16 = require("node:path");
 init_src();
 init_adb();
 var androidImpl3 = {
   requires: ["adb"],
   handler: async (_services, params) => {
     const { udid, bundleId, appPath } = params;
-    const absolute = (0, import_node_path13.resolve)(appPath);
+    const absolute = (0, import_node_path16.resolve)(appPath);
     try {
       await runAdb(["-s", udid, "uninstall", bundleId], { timeoutMs: 3e4 });
     } catch {
@@ -125414,12 +125454,12 @@ ${stderr}`;
 };
 
 // ../tool-server/src/tools/reinstall-app/platforms/ios-remote.ts
-var import_node_path14 = require("node:path");
+var import_node_path17 = require("node:path");
 var iosRemoteImpl3 = {
   requires: ["sim-remote"],
   handler: async (_services, params) => {
     const { udid, bundleId, appPath } = params;
-    const absolute = (0, import_node_path14.resolve)(appPath);
+    const absolute = (0, import_node_path17.resolve)(appPath);
     try {
       await simctlUninstall(udid, bundleId);
     } catch {
@@ -125430,13 +125470,13 @@ var iosRemoteImpl3 = {
 };
 
 // ../tool-server/src/tools/reinstall-app/platforms/vega.ts
-var import_node_path15 = require("node:path");
+var import_node_path18 = require("node:path");
 init_src();
 var vegaImpl3 = {
   requires: ["vega"],
   handler: async (_services, params) => {
     const { udid, bundleId, appPath } = params;
-    const absolute = (0, import_node_path15.resolve)(appPath);
+    const absolute = (0, import_node_path18.resolve)(appPath);
     await vegaDevice(udid, ["uninstall-app", "-a", bundleId], { timeoutMs: 6e4 }).catch(
       () => {
       }
@@ -125517,10 +125557,10 @@ var PERMISSION_NAMES = [
 ];
 
 // ../tool-server/src/tools/settings-permissions/platforms/ios.ts
-var import_node_child_process23 = require("node:child_process");
-var import_node_util17 = require("node:util");
+var import_node_child_process22 = require("node:child_process");
+var import_node_util16 = require("node:util");
 init_src();
-var execFileAsync17 = (0, import_node_util17.promisify)(import_node_child_process23.execFile);
+var execFileAsync16 = (0, import_node_util16.promisify)(import_node_child_process22.execFile);
 var SIMCTL_ACTION = {
   grant: "grant",
   deny: "revoke",
@@ -125545,13 +125585,13 @@ var NON_TCC_GRANT_NEEDS_INSTALL = /* @__PURE__ */ new Set([
 ]);
 var localBackend = {
   async run(udid, simctlAction, service, bundleId) {
-    await execFileAsync17("xcrun", ["simctl", "privacy", udid, simctlAction, service, bundleId], {
+    await execFileAsync16("xcrun", ["simctl", "privacy", udid, simctlAction, service, bundleId], {
       timeout: 3e4
     });
   },
   async isInstalled(udid, bundleId) {
     try {
-      await execFileAsync17("xcrun", ["simctl", "get_app_container", udid, bundleId], {
+      await execFileAsync16("xcrun", ["simctl", "get_app_container", udid, bundleId], {
         timeout: 15e3
       });
       return true;
@@ -125823,8 +125863,8 @@ Returns { action, permission, bundleId, applied, skipped? }: \`applied\` lists t
 init_zod();
 
 // ../tool-server/src/tools/open-url/platforms/ios.ts
-var import_node_child_process24 = require("node:child_process");
-var import_node_util18 = require("node:util");
+var import_node_child_process23 = require("node:child_process");
+var import_node_util17 = require("node:util");
 init_src();
 
 // ../tool-server/src/tools/open-url/deep-link-note.ts
@@ -125834,12 +125874,12 @@ function httpDeepLinkNote(url2) {
 }
 
 // ../tool-server/src/tools/open-url/platforms/ios.ts
-var execFileAsync18 = (0, import_node_util18.promisify)(import_node_child_process24.execFile);
+var execFileAsync17 = (0, import_node_util17.promisify)(import_node_child_process23.execFile);
 var iosImpl3 = {
   requires: ["xcrun"],
   handler: async (_services, params) => {
     try {
-      await execFileAsync18("xcrun", ["simctl", "openurl", params.udid, params.url]);
+      await execFileAsync17("xcrun", ["simctl", "openurl", params.udid, params.url]);
     } catch (err) {
       throw new FailureError(
         `Failed to open URL on iOS simulator ${params.udid}.`,
@@ -125939,16 +125979,16 @@ Returns { opened, url, note? }. note carries the deep-linking caveat when a web
 };
 
 // ../tool-server/src/tools/screenshot/index.ts
-var import_node_child_process25 = require("node:child_process");
-var import_node_util19 = require("node:util");
+var import_node_child_process24 = require("node:child_process");
+var import_node_util18 = require("node:util");
 var os9 = __toESM(require("node:os"));
 var path19 = __toESM(require("node:path"));
 init_zod();
 
 // ../tool-server/src/utils/vega-screen.ts
 var import_promises10 = require("node:fs/promises");
-var import_node_os10 = require("node:os");
-var import_node_path16 = require("node:path");
+var import_node_os12 = require("node:os");
+var import_node_path19 = require("node:path");
 var import_pngjs = __toESM(require_png());
 init_src();
 init_adb();
@@ -126115,7 +126155,7 @@ async function captureVegaScreenshotPng(opts = {}) {
 async function captureViaEmulatorConsole(opts) {
   const port = await discoverVegaConsolePort();
   const serial = `emulator-${port}`;
-  const outDir = await (0, import_promises10.mkdtemp)((0, import_node_path16.join)((0, import_node_os10.tmpdir)(), "vega-shot-"));
+  const outDir = await (0, import_promises10.mkdtemp)((0, import_node_path19.join)((0, import_node_os12.tmpdir)(), "vega-shot-"));
   try {
     await runAdb(["-s", serial, "emu", "screenrecord", "screenshot", outDir], {
       timeoutMs: 2e4
@@ -126129,9 +126169,9 @@ async function captureViaEmulatorConsole(opts) {
         error_kind: "unknown"
       });
     }
-    const decoded = import_pngjs.PNG.sync.read(await (0, import_promises10.readFile)((0, import_node_path16.join)(outDir, pngName)));
+    const decoded = import_pngjs.PNG.sync.read(await (0, import_promises10.readFile)((0, import_node_path19.join)(outDir, pngName)));
     const scaled = scalePng(decoded, opts.scale);
-    const outPath = (0, import_node_path16.join)((0, import_node_os10.tmpdir)(), `vega-screenshot-${process.hrtime.bigint()}.png`);
+    const outPath = (0, import_node_path19.join)((0, import_node_os12.tmpdir)(), `vega-screenshot-${process.hrtime.bigint()}.png`);
     await (0, import_promises10.writeFile)(outPath, import_pngjs.PNG.sync.write(scaled));
     return outPath;
   } finally {
@@ -126155,7 +126195,7 @@ function scalePng(src, scale) {
 }
 
 // ../tool-server/src/tools/screenshot/index.ts
-var execFileAsync19 = (0, import_node_util19.promisify)(import_node_child_process25.execFile);
+var execFileAsync18 = (0, import_node_util18.promisify)(import_node_child_process24.execFile);
 var zodSchema15 = external_exports.object({
   udid: external_exports.string().describe(
     "Target device id from `list-devices` (iOS UDID, Android serial, Apple TV UDID, Vega serial, or Chromium id)."
@@ -126185,9 +126225,9 @@ async function tvScreenshot(udid, scale, signal) {
     os9.tmpdir(),
     `argent-tv-screenshot-${udid.slice(0, 8)}-${process.hrtime.bigint()}.png`
   );
-  await execFileAsync19("xcrun", ["simctl", "io", udid, "screenshot", file2], { signal });
+  await execFileAsync18("xcrun", ["simctl", "io", udid, "screenshot", file2], { signal });
   if (scale < 1) {
-    await execFileAsync19("sips", ["-Z", String(await tvTargetLongSide(file2, scale)), file2], {
+    await execFileAsync18("sips", ["-Z", String(await tvTargetLongSide(file2, scale)), file2], {
       signal
     }).catch(() => {
     });
@@ -126197,7 +126237,7 @@ async function tvScreenshot(udid, scale, signal) {
 async function tvTargetLongSide(file2, scale) {
   let longSide = 3840;
   try {
-    const { stdout } = await execFileAsync19("sips", ["-g", "pixelWidth", "-g", "pixelHeight", file2]);
+    const { stdout } = await execFileAsync18("sips", ["-g", "pixelWidth", "-g", "pixelHeight", file2]);
     const width = Number(/pixelWidth:\s*(\d+)/.exec(stdout)?.[1]);
     const height = Number(/pixelHeight:\s*(\d+)/.exec(stdout)?.[1]);
     if (Number.isFinite(width) && Number.isFinite(height) && width > 0 && height > 0) {
@@ -139245,7 +139285,7 @@ var nativeProfilerSessionBlueprint = {
 var import_child_process4 = require("child_process");
 init_src();
 var import_fs9 = require("fs");
-var import_node_fs13 = require("node:fs");
+var import_node_fs14 = require("node:fs");
 var path22 = __toESM(require("path"));
 
 // ../tool-server/src/utils/ios-profiler/notify.ts
@@ -139392,8 +139432,8 @@ var import_util6 = require("util");
 var DEFAULT_EXEC_TIMEOUT_MS = 6e4;
 var DEFAULT_EXEC_MAX_BUFFER = 256 * 1024 * 1024;
 async function execFileAsyncWithTimeout(file2, args, options = {}) {
-  const execFileAsync23 = (0, import_util6.promisify)(import_child_process2.execFile);
-  const { stdout, stderr } = await execFileAsync23(file2, args, {
+  const execFileAsync22 = (0, import_util6.promisify)(import_child_process2.execFile);
+  const { stdout, stderr } = await execFileAsync22(file2, args, {
     encoding: "utf-8",
     ...options,
     // The timeout and maxBuffer are this wrapper's whole purpose (the
@@ -140894,7 +140934,7 @@ function resolveDefaultTemplatePath() {
     )
   ];
   for (const candidate of candidates) {
-    if ((0, import_node_fs13.existsSync)(candidate)) return candidate;
+    if ((0, import_node_fs14.existsSync)(candidate)) return candidate;
   }
   throw new FailureError(
     `Argent.tracetemplate not found. Looked in:
@@ -144615,7 +144655,39 @@ function createStopAllSimulatorServersTool(registry2) {
 
 // ../tool-server/src/tools/simulator/stop-metro.ts
 init_zod();
-var import_node_child_process26 = require("node:child_process");
+var import_node_child_process25 = require("node:child_process");
+function parseNetstatListeningPids(netstatOutput, port) {
+  const pids = /* @__PURE__ */ new Set();
+  for (const line of netstatOutput.split(/\r?\n/)) {
+    const cols = line.trim().split(/\s+/);
+    if (cols.length < 5 || cols[0].toUpperCase() !== "TCP") continue;
+    if (!cols[1].endsWith(`:${port}`)) continue;
+    const foreign = cols[2];
+    if (foreign !== "*:*" && !foreign.endsWith(":0")) continue;
+    const pid = parseInt(cols[cols.length - 1], 10);
+    if (!Number.isNaN(pid) && pid > 0) pids.add(pid);
+  }
+  return [...pids];
+}
+function listeningPids(port) {
+  if (process.platform === "win32") {
+    const output2 = (0, import_node_child_process25.execFileSync)("netstat", ["-ano"], {
+      encoding: "utf-8",
+      timeout: 5e3,
+      // `netstat -ano` dumps every socket on the host; a busy box easily
+      // exceeds Node's default 1 MiB maxBuffer, and the resulting ENOBUFS
+      // throw would misread as "port is free" (stopped:false).
+      maxBuffer: 16 * 1024 * 1024
+    });
+    return parseNetstatListeningPids(output2, port);
+  }
+  const output = (0, import_node_child_process25.execFileSync)("lsof", ["-ti", `tcp:${port}`, "-sTCP:LISTEN"], {
+    encoding: "utf-8",
+    timeout: 5e3
+  }).trim();
+  if (!output) return [];
+  return output.split("\n").map((s) => parseInt(s.trim(), 10)).filter((n) => !Number.isNaN(n));
+}
 var zodSchema57 = external_exports.object({
   port: external_exports.number().int().min(1).max(65535).default(8081).describe("TCP port Metro is listening on (default 8081)")
 });
@@ -144627,14 +144699,7 @@ var stopMetroTool = {
   async execute(_services, params) {
     const port = params.port;
     try {
-      const output = (0, import_node_child_process26.execFileSync)("lsof", ["-ti", `tcp:${port}`, "-sTCP:LISTEN"], {
-        encoding: "utf-8",
-        timeout: 5e3
-      }).trim();
-      if (!output) {
-        return { stopped: false, port, pids: [] };
-      }
-      const pids = output.split("\n").map((s) => parseInt(s.trim(), 10)).filter((n) => !isNaN(n));
+      const pids = listeningPids(port);
       if (pids.length === 0) {
         return { stopped: false, port, pids: [] };
       }
@@ -146826,7 +146891,7 @@ var import_pngjs2 = __toESM(require_png());
 // ../tool-server/src/tools/screenshot-diff/screenshot-diff-ocr.ts
 var import_child_process6 = require("child_process");
 var import_util7 = require("util");
-var execFileAsync20 = (0, import_util7.promisify)(import_child_process6.execFile);
+var execFileAsync19 = (0, import_util7.promisify)(import_child_process6.execFile);
 var OCR_TIMEOUT_MS = 1e4;
 var OCR_MAX_BUFFER_BYTES = 32 * 1024 * 1024;
 var TESSERACT_BINARY = "tesseract";
@@ -146871,7 +146936,7 @@ async function extractOcrTextBlocks(imagePath) {
   }
 }
 async function recognizeTsv(imagePath) {
-  const { stdout } = await execFileAsync20(
+  const { stdout } = await execFileAsync19(
     TESSERACT_BINARY,
     [
       imagePath,
@@ -148959,15 +149024,15 @@ async function runSnapshot(env, opts) {
 }
 
 // ../tool-server/src/utils/status-bar.ts
-var import_node_child_process27 = require("node:child_process");
-var import_node_util20 = require("node:util");
+var import_node_child_process26 = require("node:child_process");
+var import_node_util19 = require("node:util");
 init_adb();
-var execFileAsync21 = (0, import_node_util20.promisify)(import_node_child_process27.execFile);
+var execFileAsync20 = (0, import_node_util19.promisify)(import_node_child_process26.execFile);
 var DEMO_BROADCAST = "am broadcast -a com.android.systemui.demo";
 async function pinStatusBar(device) {
   try {
     if (device.platform === "ios") {
-      await execFileAsync21("xcrun", [
+      await execFileAsync20("xcrun", [
         "simctl",
         "status_bar",
         device.id,
@@ -149008,7 +149073,7 @@ async function pinStatusBar(device) {
 async function restoreStatusBar(device) {
   try {
     if (device.platform === "ios") {
-      await execFileAsync21("xcrun", ["simctl", "status_bar", device.id, "clear"]);
+      await execFileAsync20("xcrun", ["simctl", "status_bar", device.id, "clear"]);
     } else if (device.platform === "android") {
       try {
         await adbShell(device.id, `${DEMO_BROADCAST} -e command exit`);
@@ -149655,8 +149720,8 @@ init_zod();
 
 // ../tool-server/src/utils/workspace-reader.ts
 var import_promises12 = require("node:fs/promises");
-var import_node_path17 = require("node:path");
-var import_node_child_process28 = require("node:child_process");
+var import_node_path20 = require("node:path");
+var import_node_child_process27 = require("node:child_process");
 var import_dotenv = __toESM(require_main());
 async function exists(path36) {
   try {
@@ -149700,7 +149765,7 @@ async function listDir(path36) {
 var COMMAND_TIMEOUT_MS = 3e3;
 function runVersionCommand(cmd, args, cwd) {
   return new Promise((resolve7) => {
-    const child = (0, import_node_child_process28.execFile)(cmd, args, { cwd, timeout: COMMAND_TIMEOUT_MS }, (err, stdout) => {
+    const child = (0, import_node_child_process27.execFile)(cmd, args, { cwd, timeout: COMMAND_TIMEOUT_MS }, (err, stdout) => {
       if (err) {
         resolve7(null);
         return;
@@ -149743,7 +149808,7 @@ async function detectLockfile(workspacePath) {
   const checks = await Promise.all(
     LOCKFILES.map(async (name) => ({
       name,
-      exists: await exists((0, import_node_path17.join)(workspacePath, name))
+      exists: await exists((0, import_node_path20.join)(workspacePath, name))
     }))
   );
   return checks.find((c) => c.exists)?.name ?? null;
@@ -149762,7 +149827,7 @@ var CI_CONFIGS = [
 ];
 async function detectCiConfig(workspacePath) {
   for (const ci of CI_CONFIGS) {
-    if (await exists((0, import_node_path17.join)(workspacePath, ci.path))) return ci.label;
+    if (await exists((0, import_node_path20.join)(workspacePath, ci.path))) return ci.label;
   }
   return null;
 }
@@ -149783,7 +149848,7 @@ async function detectLintStagedConfig(workspacePath, packageJson) {
     return packageJson["lint-staged"];
   }
   for (const file2 of LINT_STAGED_FILES) {
-    const full = (0, import_node_path17.join)(workspacePath, file2);
+    const full = (0, import_node_path20.join)(workspacePath, file2);
     if (await exists(full)) {
       if (file2.endsWith(".json") || file2 === ".lintstagedrc") {
         return readJsonFile(full);
@@ -149825,7 +149890,7 @@ var CONFIG_FILES = [
 async function detectConfigFiles(workspacePath) {
   const results = await Promise.allSettled(
     CONFIG_FILES.map(async (file2) => {
-      if (await exists((0, import_node_path17.join)(workspacePath, file2))) return file2;
+      if (await exists((0, import_node_path20.join)(workspacePath, file2))) return file2;
       return null;
     })
   );
@@ -149864,7 +149929,7 @@ async function detectEnvFiles(workspacePath) {
   const envFileNames = entries.filter((e) => e === ".env" || e.startsWith(".env."));
   const results = await Promise.all(
     envFileNames.map(async (name) => {
-      const content = await readTextFile((0, import_node_path17.join)(workspacePath, name));
+      const content = await readTextFile((0, import_node_path20.join)(workspacePath, name));
       return {
         name,
         keys: content ? extractEnvKeys(content) : []
@@ -149891,34 +149956,34 @@ async function readWorkspaceSnapshot(workspacePath) {
     ciConfig,
     configFilesFound
   ] = await Promise.all([
-    readJsonFile((0, import_node_path17.join)(workspacePath, "package.json")),
-    readJsonFile((0, import_node_path17.join)(workspacePath, "app.json")),
-    readJsonFile((0, import_node_path17.join)(workspacePath, "eas.json")),
-    readJsonFile((0, import_node_path17.join)(workspacePath, "tsconfig.json")),
-    readTextFile((0, import_node_path17.join)(workspacePath, "metro.config.js")).then(
-      (r) => r ?? readTextFile((0, import_node_path17.join)(workspacePath, "metro.config.ts"))
+    readJsonFile((0, import_node_path20.join)(workspacePath, "package.json")),
+    readJsonFile((0, import_node_path20.join)(workspacePath, "app.json")),
+    readJsonFile((0, import_node_path20.join)(workspacePath, "eas.json")),
+    readJsonFile((0, import_node_path20.join)(workspacePath, "tsconfig.json")),
+    readTextFile((0, import_node_path20.join)(workspacePath, "metro.config.js")).then(
+      (r) => r ?? readTextFile((0, import_node_path20.join)(workspacePath, "metro.config.ts"))
     ),
-    readTextFile((0, import_node_path17.join)(workspacePath, "babel.config.js")).then(
-      (r) => r ?? readTextFile((0, import_node_path17.join)(workspacePath, "babel.config.cjs"))
+    readTextFile((0, import_node_path20.join)(workspacePath, "babel.config.js")).then(
+      (r) => r ?? readTextFile((0, import_node_path20.join)(workspacePath, "babel.config.cjs"))
     ),
-    isDirectory((0, import_node_path17.join)(workspacePath, "ios")),
-    isDirectory((0, import_node_path17.join)(workspacePath, "android")),
+    isDirectory((0, import_node_path20.join)(workspacePath, "ios")),
+    isDirectory((0, import_node_path20.join)(workspacePath, "android")),
     detectLockfile(workspacePath),
     detectEnvFiles(workspacePath),
     detectToolVersions(workspacePath),
-    listDir((0, import_node_path17.join)(workspacePath, "scripts")),
-    listDir((0, import_node_path17.join)(workspacePath, ".husky")),
+    listDir((0, import_node_path20.join)(workspacePath, "scripts")),
+    listDir((0, import_node_path20.join)(workspacePath, ".husky")),
     detectCiConfig(workspacePath),
     detectConfigFiles(workspacePath)
   ]);
-  const iosDir = (0, import_node_path17.join)(workspacePath, "ios");
-  const androidDir = (0, import_node_path17.join)(workspacePath, "android");
+  const iosDir = (0, import_node_path20.join)(workspacePath, "ios");
+  const androidDir = (0, import_node_path20.join)(workspacePath, "android");
   const [iosWorkspace, iosHasPodfile, makefileText, lintStagedConfig, androidHasGradle] = await Promise.all([
     hasIosDir ? findIosWorkspace(iosDir) : Promise.resolve(null),
-    exists((0, import_node_path17.join)(workspacePath, "ios", "Podfile")),
-    readTextFile((0, import_node_path17.join)(workspacePath, "Makefile")),
+    exists((0, import_node_path20.join)(workspacePath, "ios", "Podfile")),
+    readTextFile((0, import_node_path20.join)(workspacePath, "Makefile")),
     detectLintStagedConfig(workspacePath, packageJson),
-    hasAndroidDir ? exists((0, import_node_path17.join)(androidDir, "gradlew")) : Promise.resolve(false)
+    hasAndroidDir ? exists((0, import_node_path20.join)(androidDir, "gradlew")) : Promise.resolve(false)
   ]);
   const metroPort = metroConfigRaw ? extractMetroPort(metroConfigRaw) : null;
   const makefileTargets = makefileText ? extractMakefileTargets(makefileText) : null;
@@ -149984,7 +150049,7 @@ Fails if the workspacePath is not an absolute path or the directory cannot be ac
 };
 
 // ../tool-server/src/tools/system/update-argent.ts
-var import_node_child_process29 = require("node:child_process");
+var import_node_child_process28 = require("node:child_process");
 var fs43 = __toESM(require("node:fs"));
 var path32 = __toESM(require("node:path"));
 init_zod();
@@ -150114,7 +150179,7 @@ var updateArgentTool = {
       if (spawnRoot) updateArgs.push("--project-root", spawnRoot);
       const cmd = cliEntry ? process.execPath : "argent";
       const args = cliEntry ? [cliEntry, ...updateArgs] : updateArgs;
-      const child = (0, import_node_child_process29.spawn)(cmd, args, {
+      const child = (0, import_node_child_process28.spawn)(cmd, args, {
         detached: true,
         stdio: "ignore",
         env: { ...process.env, ARGENT_UPDATE_TRIGGER: "mcp_update" }
@@ -150163,7 +150228,7 @@ var dismissUpdateTool = {
 // ../tool-server/src/tools/screenshot-diff/index.ts
 var import_node_crypto8 = __toESM(require("node:crypto"));
 var import_promises13 = __toESM(require("fs/promises"));
-var import_node_os11 = __toESM(require("node:os"));
+var import_node_os13 = __toESM(require("node:os"));
 var import_path9 = __toESM(require("path"));
 init_zod();
 init_src();
@@ -150245,7 +150310,7 @@ async function resolveOutputDir(params, options) {
     return params.outputDir;
   }
   const dir = import_path9.default.join(
-    import_node_os11.default.tmpdir(),
+    import_node_os13.default.tmpdir(),
     "argent-screenshot-diff",
     import_node_crypto8.default.randomBytes(6).toString("hex")
   );
@@ -150936,13 +151001,34 @@ function createRegistry() {
   return registry2;
 }
 
+// ../tool-server/src/utils/probe-argent-tool-server.ts
+var http3 = __toESM(require("node:http"));
+function probeArgentToolServer(host, port, timeoutMs = 500) {
+  return new Promise((resolve7) => {
+    const req = http3.request(
+      { host, port, path: "/tools", method: "GET", timeout: timeoutMs },
+      (res) => {
+        const isArgentPeer = res.statusCode === 200 || res.statusCode === 401;
+        res.resume();
+        resolve7(isArgentPeer);
+      }
+    );
+    req.on("error", () => resolve7(false));
+    req.on("timeout", () => {
+      req.destroy();
+      resolve7(false);
+    });
+    req.end();
+  });
+}
+
 // ../tool-server/src/utils/simulator-watcher.ts
-var import_node_child_process30 = require("node:child_process");
-var import_node_util21 = require("node:util");
-var execFileAsync22 = (0, import_node_util21.promisify)(import_node_child_process30.execFile);
+var import_node_child_process29 = require("node:child_process");
+var import_node_util20 = require("node:util");
+var execFileAsync21 = (0, import_node_util20.promisify)(import_node_child_process29.execFile);
 var POLL_INTERVAL_MS2 = 1e4;
 async function getBootedUdids() {
-  const { stdout } = await execFileAsync22("xcrun", ["simctl", "list", "devices", "--json"]);
+  const { stdout } = await execFileAsync21("xcrun", ["simctl", "list", "devices", "--json"]);
   const data = JSON.parse(stdout);
   const udids = /* @__PURE__ */ new Set();
   for (const devices of Object.values(data.devices)) {
@@ -150999,7 +151085,7 @@ function startSimulatorWatcher(registry2) {
 }
 
 // ../tool-server/src/utils/preview-window.ts
-var import_node_child_process31 = require("node:child_process");
+var import_node_child_process30 = require("node:child_process");
 var fs45 = __toESM(require("node:fs"));
 var os12 = __toESM(require("node:os"));
 var path34 = __toESM(require("node:path"));
@@ -151031,10 +151117,10 @@ function ensureLensAppBundle(electronBin) {
     fs45.copyFileSync(path34.join(realContents, "Info.plist"), plist);
     const setPlist = (entry, value) => {
       try {
-        (0, import_node_child_process31.execFileSync)("/usr/libexec/PlistBuddy", ["-c", `Set :${entry} ${value}`, plist]);
+        (0, import_node_child_process30.execFileSync)("/usr/libexec/PlistBuddy", ["-c", `Set :${entry} ${value}`, plist]);
       } catch {
         try {
-          (0, import_node_child_process31.execFileSync)("/usr/libexec/PlistBuddy", ["-c", `Add :${entry} string ${value}`, plist]);
+          (0, import_node_child_process30.execFileSync)("/usr/libexec/PlistBuddy", ["-c", `Add :${entry} string ${value}`, plist]);
         } catch {
         }
       }
@@ -151093,7 +151179,7 @@ function createPreviewWindowManager(opts = {}) {
     const wrapperBin = ensureLensAppBundle(electronBin);
     const launchBin = wrapperBin ?? electronBin;
     const launchArgs = wrapperBin ? ["--no-sandbox", mainScript] : [mainScript];
-    const next = (0, import_node_child_process31.spawn)(launchBin, launchArgs, {
+    const next = (0, import_node_child_process30.spawn)(launchBin, launchArgs, {
       // Strip ELECTRON_RUN_AS_NODE so the child boots as a GUI Electron app, not
       // a bare Node runtime (see electronGuiChildEnv). An Electron-based MCP
       // host puts it in our env, and inheriting it makes main.cjs crash at
@@ -151218,7 +151304,7 @@ function start() {
   attachRegistryLogger(registry2);
   let eventLog = null;
   if (isFlagEnabled("tool-server-event-log")) {
-    const eventLogPath = process.env.ARGENT_EVENT_LOG || path35.join((0, import_node_os12.homedir)(), ".argent", "tool-server-events.jsonl");
+    const eventLogPath = process.env.ARGENT_EVENT_LOG || path35.join((0, import_node_os14.homedir)(), ".argent", "tool-server-events.jsonl");
     try {
       eventLog = createToolServerEventLog({ filePath: eventLogPath });
     } catch (err) {
@@ -151415,31 +151501,51 @@ function start() {
       } catch {
       }
     });
+    const bindSignal = {
+      error_code: FAILURE_CODES.ARGENT_UNCLASSIFIED_FAILURE,
+      failure_stage: "toolserver_bind",
+      failure_area: "tool_server",
+      error_kind: "crash"
+    };
     server.on("error", (err) => {
-      eventLog?.error({
-        type: "tool_server.bind_failed",
-        msg: `Tool server failed to bind ${HOST}:${PORT}.`,
-        host: HOST,
-        port: PORT,
-        failureSignal: {
-          error_code: FAILURE_CODES.ARGENT_UNCLASSIFIED_FAILURE,
-          failure_stage: "toolserver_bind",
-          failure_area: "tool_server",
-          error_kind: "crash"
-        }
-      });
       const code = err.code ? `${err.code}: ` : "";
-      crashShutdown(
-        `Failed to bind ${HOST}:${PORT}`,
-        `${code}${err.message}`,
-        {
-          error_code: FAILURE_CODES.ARGENT_UNCLASSIFIED_FAILURE,
-          failure_stage: "toolserver_bind",
-          failure_area: "tool_server",
-          error_kind: "crash"
-        },
-        err
-      );
+      const crashBind = () => {
+        eventLog?.error({
+          type: "tool_server.bind_failed",
+          msg: `Tool server failed to bind ${HOST}:${PORT}.`,
+          host: HOST,
+          port: PORT,
+          failureSignal: {
+            error_code: bindSignal.error_code,
+            failure_stage: bindSignal.failure_stage,
+            failure_area: bindSignal.failure_area,
+            error_kind: bindSignal.error_kind
+          }
+        });
+        crashShutdown(`Failed to bind ${HOST}:${PORT}`, `${code}${err.message}`, bindSignal, err);
+      };
+      if (err.code === "EADDRINUSE") {
+        void probeArgentToolServer(HOST, PORT).then((isArgentPeer) => {
+          if (!isArgentPeer) {
+            crashBind();
+            return;
+          }
+          process.stderr.write(
+            `Another argent tool-server already owns ${HOST}:${PORT}; deferring to it (redundant instance).
+`
+          );
+          eventLog?.info({
+            type: "tool_server.deferred_to_existing",
+            msg: `Deferred to an existing tool-server on ${HOST}:${PORT}.`,
+            host: HOST,
+            port: PORT
+          });
+          shutdownReason = "deferred";
+          void shutdown2?.(0);
+        });
+        return;
+      }
+      crashBind();
     });
     httpHandle.attachChromiumWebsockets(server);
   }).catch((err) => {