@qawolf/cli 1.4.0 → 1.4.2

package/dist/cli.js

@@ -4087,7 +4087,7 @@ var require_thread_stream = __commonJS((exports, module) => {
   var { version: version2 } = require_package();
   var { EventEmitter } = __require("events");
   var { Worker } = __require("worker_threads");
-  var { join: join4 } = __require("path");
+  var { join: join5 } = __require("path");
   var { pathToFileURL } = __require("url");
   var { wait } = require_wait();
   var {
@@ -4137,7 +4137,7 @@ var require_thread_stream = __commonJS((exports, module) => {
   function createWorker(stream, opts) {
     const { filename, workerData } = opts;
     const bundlerOverrides = "__bundlerPathsOverrides" in globalThis ? globalThis.__bundlerPathsOverrides : {};
-    const toExecute = bundlerOverrides["thread-stream-worker"] || join4(__dirname, "lib", "worker.js");
+    const toExecute = bundlerOverrides["thread-stream-worker"] || join5(__dirname, "lib", "worker.js");
     const worker = new Worker(toExecute, {
       ...opts.workerOpts,
       name: opts.workerOpts?.name || "thread-stream",
@@ -4603,7 +4603,7 @@ var require_transport = __commonJS((exports, module) => {
   var { createRequire: createRequire2 } = __require("module");
   var { existsSync: existsSync2 } = __require("node:fs");
   var getCallers = require_caller();
-  var { join: join4, isAbsolute, sep } = __require("node:path");
+  var { join: join5, isAbsolute, sep } = __require("node:path");
   var { fileURLToPath } = __require("node:url");
   var sleep = require_atomic_sleep();
   var onExit = require_on_exit_leak_free();
@@ -4756,7 +4756,7 @@ var require_transport = __commonJS((exports, module) => {
       throw new Error("only one of target or targets can be specified");
     }
     if (targets) {
-      target = bundlerOverrides["pino-worker"] || join4(__dirname, "worker.js");
+      target = bundlerOverrides["pino-worker"] || join5(__dirname, "worker.js");
       options.targets = targets.filter((dest) => dest.target).map((dest) => {
         return {
           ...dest,
@@ -4773,7 +4773,7 @@ var require_transport = __commonJS((exports, module) => {
         });
       });
     } else if (pipeline) {
-      target = bundlerOverrides["pino-worker"] || join4(__dirname, "worker.js");
+      target = bundlerOverrides["pino-worker"] || join5(__dirname, "worker.js");
       options.pipelines = [pipeline.map((dest) => {
         return {
           ...dest,
@@ -4796,7 +4796,7 @@ var require_transport = __commonJS((exports, module) => {
         return origin;
       }
       if (origin === "pino/file") {
-        return join4(__dirname, "..", "file.js");
+        return join5(__dirname, "..", "file.js");
       }
       let fixTarget2;
       for (const filePath of callers) {
@@ -5725,7 +5725,7 @@ var require_safe_stable_stringify = __commonJS((exports, module) => {
             return circularValue;
           }
           let res = "";
-          let join4 = ",";
+          let join5 = ",";
           const originalIndentation = indentation;
           if (Array.isArray(value)) {
             if (value.length === 0) {
@@ -5739,7 +5739,7 @@ var require_safe_stable_stringify = __commonJS((exports, module) => {
               indentation += spacer;
               res += `
 ${indentation}`;
-              join4 = `,
+              join5 = `,
 ${indentation}`;
             }
             const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
@@ -5747,13 +5747,13 @@ ${indentation}`;
             for (;i < maximumValuesToStringify - 1; i++) {
               const tmp2 = stringifyFnReplacer(String(i), value, stack, replacer, spacer, indentation);
               res += tmp2 !== undefined ? tmp2 : "null";
-              res += join4;
+              res += join5;
             }
             const tmp = stringifyFnReplacer(String(i), value, stack, replacer, spacer, indentation);
             res += tmp !== undefined ? tmp : "null";
             if (value.length - 1 > maximumBreadth) {
               const removedKeys = value.length - maximumBreadth - 1;
-              res += `${join4}"... ${getItemCount(removedKeys)} not stringified"`;
+              res += `${join5}"... ${getItemCount(removedKeys)} not stringified"`;
             }
             if (spacer !== "") {
               res += `
@@ -5774,7 +5774,7 @@ ${originalIndentation}`;
           let separator = "";
           if (spacer !== "") {
             indentation += spacer;
-            join4 = `,
+            join5 = `,
 ${indentation}`;
             whitespace = " ";
           }
@@ -5788,13 +5788,13 @@ ${indentation}`;
             const tmp = stringifyFnReplacer(key2, value, stack, replacer, spacer, indentation);
             if (tmp !== undefined) {
               res += `${separator}${strEscape(key2)}:${whitespace}${tmp}`;
-              separator = join4;
+              separator = join5;
             }
           }
           if (keyLength > maximumBreadth) {
             const removedKeys = keyLength - maximumBreadth;
             res += `${separator}"...":${whitespace}"${getItemCount(removedKeys)} not stringified"`;
-            separator = join4;
+            separator = join5;
           }
           if (spacer !== "" && separator.length > 1) {
             res = `
@@ -5834,7 +5834,7 @@ ${originalIndentation}`;
           }
           const originalIndentation = indentation;
           let res = "";
-          let join4 = ",";
+          let join5 = ",";
           if (Array.isArray(value)) {
             if (value.length === 0) {
               return "[]";
@@ -5847,7 +5847,7 @@ ${originalIndentation}`;
               indentation += spacer;
               res += `
 ${indentation}`;
-              join4 = `,
+              join5 = `,
 ${indentation}`;
             }
             const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
@@ -5855,13 +5855,13 @@ ${indentation}`;
             for (;i < maximumValuesToStringify - 1; i++) {
               const tmp2 = stringifyArrayReplacer(String(i), value[i], stack, replacer, spacer, indentation);
               res += tmp2 !== undefined ? tmp2 : "null";
-              res += join4;
+              res += join5;
             }
             const tmp = stringifyArrayReplacer(String(i), value[i], stack, replacer, spacer, indentation);
             res += tmp !== undefined ? tmp : "null";
             if (value.length - 1 > maximumBreadth) {
               const removedKeys = value.length - maximumBreadth - 1;
-              res += `${join4}"... ${getItemCount(removedKeys)} not stringified"`;
+              res += `${join5}"... ${getItemCount(removedKeys)} not stringified"`;
             }
             if (spacer !== "") {
               res += `
@@ -5874,7 +5874,7 @@ ${originalIndentation}`;
           let whitespace = "";
           if (spacer !== "") {
             indentation += spacer;
-            join4 = `,
+            join5 = `,
 ${indentation}`;
             whitespace = " ";
           }
@@ -5883,7 +5883,7 @@ ${indentation}`;
             const tmp = stringifyArrayReplacer(key2, value[key2], stack, replacer, spacer, indentation);
             if (tmp !== undefined) {
               res += `${separator}${strEscape(key2)}:${whitespace}${tmp}`;
-              separator = join4;
+              separator = join5;
             }
           }
           if (spacer !== "" && separator.length > 1) {
@@ -5940,20 +5940,20 @@ ${originalIndentation}`;
             indentation += spacer;
             let res2 = `
 ${indentation}`;
-            const join5 = `,
+            const join6 = `,
 ${indentation}`;
             const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
             let i = 0;
             for (;i < maximumValuesToStringify - 1; i++) {
               const tmp2 = stringifyIndent(String(i), value[i], stack, spacer, indentation);
               res2 += tmp2 !== undefined ? tmp2 : "null";
-              res2 += join5;
+              res2 += join6;
             }
             const tmp = stringifyIndent(String(i), value[i], stack, spacer, indentation);
             res2 += tmp !== undefined ? tmp : "null";
             if (value.length - 1 > maximumBreadth) {
               const removedKeys = value.length - maximumBreadth - 1;
-              res2 += `${join5}"... ${getItemCount(removedKeys)} not stringified"`;
+              res2 += `${join6}"... ${getItemCount(removedKeys)} not stringified"`;
             }
             res2 += `
 ${originalIndentation}`;
@@ -5969,16 +5969,16 @@ ${originalIndentation}`;
             return '"[Object]"';
           }
           indentation += spacer;
-          const join4 = `,
+          const join5 = `,
 ${indentation}`;
           let res = "";
           let separator = "";
           let maximumPropertiesToStringify = Math.min(keyLength, maximumBreadth);
           if (isTypedArrayWithEntries(value)) {
-            res += stringifyTypedArray(value, join4, maximumBreadth);
+            res += stringifyTypedArray(value, join5, maximumBreadth);
             keys = keys.slice(value.length);
             maximumPropertiesToStringify -= value.length;
-            separator = join4;
+            separator = join5;
           }
           if (deterministic) {
             keys = sort(keys, comparator);
@@ -5989,13 +5989,13 @@ ${indentation}`;
             const tmp = stringifyIndent(key2, value[key2], stack, spacer, indentation);
             if (tmp !== undefined) {
               res += `${separator}${strEscape(key2)}: ${tmp}`;
-              separator = join4;
+              separator = join5;
             }
           }
           if (keyLength > maximumBreadth) {
             const removedKeys = keyLength - maximumBreadth;
             res += `${separator}"...": "${getItemCount(removedKeys)} not stringified"`;
-            separator = join4;
+            separator = join5;
           }
           if (separator !== "") {
             res = `
@@ -10517,8 +10517,8 @@ var require_lib2 = __commonJS((exports, module) => {
       return this;
     }
     var p3 = this.constructor;
-    return this.then(resolve10, reject2);
-    function resolve10(value) {
+    return this.then(resolve11, reject2);
+    function resolve11(value) {
       function yes() {
         return value;
       }
@@ -10671,8 +10671,8 @@ var require_lib2 = __commonJS((exports, module) => {
     }
     return out;
   }
-  Promise2.resolve = resolve9;
-  function resolve9(value) {
+  Promise2.resolve = resolve10;
+  function resolve10(value) {
     if (value instanceof this) {
       return value;
     }
@@ -11171,10 +11171,10 @@ var require_utils2 = __commonJS((exports) => {
     var promise3 = external2.Promise.resolve(inputData).then(function(data) {
       var isBlob2 = support.blob && (data instanceof Blob || ["[object File]", "[object Blob]"].indexOf(Object.prototype.toString.call(data)) !== -1);
       if (isBlob2 && typeof FileReader !== "undefined") {
-        return new external2.Promise(function(resolve9, reject) {
+        return new external2.Promise(function(resolve10, reject) {
           var reader = new FileReader;
           reader.onload = function(e) {
-            resolve9(e.target.result);
+            resolve10(e.target.result);
           };
           reader.onerror = function(e) {
             reject(e.target.error);
@@ -11638,7 +11638,7 @@ var require_StreamHelper = __commonJS((exports, module) => {
     }
   }
   function accumulate(helper, updateCallback) {
-    return new external2.Promise(function(resolve9, reject) {
+    return new external2.Promise(function(resolve10, reject) {
       var dataArray = [];
       var { _internalType: chunkType, _outputType: resultType, _mimeType: mimeType } = helper;
       helper.on("data", function(data, meta3) {
@@ -11652,7 +11652,7 @@ var require_StreamHelper = __commonJS((exports, module) => {
       }).on("end", function() {
         try {
           var result = transformZipOutput(resultType, concat(chunkType, dataArray), mimeType);
-          resolve9(result);
+          resolve10(result);
         } catch (e) {
           reject(e);
         }
@@ -17228,7 +17228,7 @@ var require_load = __commonJS((exports, module) => {
   var Crc32Probe = require_Crc32Probe();
   var nodejsUtils = require_nodejsUtils();
   function checkEntryCRC32(zipEntry) {
-    return new external2.Promise(function(resolve9, reject) {
+    return new external2.Promise(function(resolve10, reject) {
       var worker = zipEntry.decompressed.getContentWorker().pipe(new Crc32Probe);
       worker.on("error", function(e) {
         reject(e);
@@ -17236,7 +17236,7 @@ var require_load = __commonJS((exports, module) => {
         if (worker.streamInfo.crc32 !== zipEntry.decompressed.crc32) {
           reject(new Error("Corrupted zip : CRC32 mismatch"));
         } else {
-          resolve9();
+          resolve10();
         }
       }).resume();
     });
@@ -19133,14 +19133,14 @@ var init_build = __esm(() => {
   maskingPatternsConfig = {};
   logCache = /* @__PURE__ */ new Set;
   originalFactory = import_loglevel.default.methodFactory;
-  getLogger.waitForBuffer = async () => new Promise((resolve9) => {
+  getLogger.waitForBuffer = async () => new Promise((resolve10) => {
     if (logFile && Array.isArray(logFile.writableBuffer) && logFile.writableBuffer.length !== 0) {
       return setTimeout(async () => {
         await getLogger.waitForBuffer();
-        resolve9();
+        resolve10();
       }, 20);
     }
-    resolve9();
+    resolve10();
   });
   getLogger.setLevel = (name, level) => loggers[name].setLevel(level);
   getLogger.clearLogger = () => {
@@ -20046,9 +20046,9 @@ var require_readdir_glob = __commonJS((exports, module) => {
   var fs4 = __require("fs");
   var { EventEmitter } = __require("events");
   var { Minimatch } = require_minimatch();
-  var { resolve: resolve9 } = __require("path");
+  var { resolve: resolve10 } = __require("path");
   function readdir3(dir, strict) {
-    return new Promise((resolve10, reject) => {
+    return new Promise((resolve11, reject) => {
       fs4.readdir(dir, { withFileTypes: true }, (err, files) => {
         if (err) {
           switch (err.code) {
@@ -20056,14 +20056,14 @@ var require_readdir_glob = __commonJS((exports, module) => {
               if (strict) {
                 reject(err);
               } else {
-                resolve10([]);
+                resolve11([]);
               }
               break;
             case "ENOTSUP":
             case "ENOENT":
             case "ENAMETOOLONG":
             case "UNKNOWN":
-              resolve10([]);
+              resolve11([]);
               break;
             case "ELOOP":
             default:
@@ -20071,30 +20071,30 @@ var require_readdir_glob = __commonJS((exports, module) => {
               break;
           }
         } else {
-          resolve10(files);
+          resolve11(files);
         }
       });
     });
   }
   function stat2(file2, followSymlinks) {
-    return new Promise((resolve10, reject) => {
+    return new Promise((resolve11, reject) => {
       const statFunc = followSymlinks ? fs4.stat : fs4.lstat;
       statFunc(file2, (err, stats) => {
         if (err) {
           switch (err.code) {
             case "ENOENT":
               if (followSymlinks) {
-                resolve10(stat2(file2, false));
+                resolve11(stat2(file2, false));
               } else {
-                resolve10(null);
+                resolve11(null);
               }
               break;
             default:
-              resolve10(null);
+              resolve11(null);
               break;
           }
         } else {
-          resolve10(stats);
+          resolve11(stats);
         }
       });
     });
@@ -20179,7 +20179,7 @@ var require_readdir_glob = __commonJS((exports, module) => {
         const skipPatterns = Array.isArray(this.options.skip) ? this.options.skip : [this.options.skip];
         this.skipMatchers = skipPatterns.map((skip) => new Minimatch(skip, { dot: true }));
       }
-      this.iterator = explore(resolve9(cwd || "."), this.options.follow, this.options.stat, this._shouldSkipDirectory.bind(this));
+      this.iterator = explore(resolve10(cwd || "."), this.options.follow, this.options.stat, this._shouldSkipDirectory.bind(this));
       this.paused = false;
       this.inactive = false;
       this.aborted = false;
@@ -20346,11 +20346,11 @@ var require_async = __commonJS((exports, module) => {
         if (typeof args[arity - 1] === "function") {
           return asyncFn.apply(this, args);
         }
-        return new Promise((resolve9, reject2) => {
+        return new Promise((resolve10, reject2) => {
           args[arity - 1] = (err, ...cbArgs) => {
             if (err)
               return reject2(err);
-            resolve9(cbArgs.length > 1 ? cbArgs : cbArgs[0]);
+            resolve10(cbArgs.length > 1 ? cbArgs : cbArgs[0]);
           };
           asyncFn.apply(this, args);
         });
@@ -20605,14 +20605,14 @@ var require_async = __commonJS((exports, module) => {
     var applyEachSeries = applyEach$1(mapSeries$1);
     const PROMISE_SYMBOL = Symbol("promiseCallback");
     function promiseCallback() {
-      let resolve9, reject2;
+      let resolve10, reject2;
       function callback2(err, ...args) {
         if (err)
           return reject2(err);
-        resolve9(args.length > 1 ? args : args[0]);
+        resolve10(args.length > 1 ? args : args[0]);
       }
       callback2[PROMISE_SYMBOL] = new Promise((res, rej) => {
-        resolve9 = res, reject2 = rej;
+        resolve10 = res, reject2 = rej;
       });
       return callback2;
     }
@@ -20980,8 +20980,8 @@ Source:
           });
         }
         if (rejectOnError || !callback2) {
-          return new Promise((resolve9, reject2) => {
-            res = resolve9;
+          return new Promise((resolve10, reject2) => {
+            res = resolve10;
             rej = reject2;
           });
         }
@@ -21020,11 +21020,11 @@ Source:
       }
       const eventMethod = (name) => (handler) => {
         if (!handler) {
-          return new Promise((resolve9, reject2) => {
+          return new Promise((resolve10, reject2) => {
             once2(name, (err, data) => {
               if (err)
                 return reject2(err);
-              resolve9(data);
+              resolve10(data);
             });
           });
         }
@@ -26584,25 +26584,25 @@ var require_util3 = __commonJS((exports, module) => {
       };
     },
     createDeferredPromise: function() {
-      let resolve9;
+      let resolve10;
       let reject;
       const promise3 = new Promise((res, rej) => {
-        resolve9 = res;
+        resolve10 = res;
         reject = rej;
       });
       return {
         promise: promise3,
-        resolve: resolve9,
+        resolve: resolve10,
         reject
       };
     },
     promisify(fn2) {
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve10, reject) => {
         fn2((err, ...args) => {
           if (err) {
             return reject(err);
           }
-          return resolve9(...args);
+          return resolve10(...args);
         });
       });
     },
@@ -27392,7 +27392,7 @@ var require_end_of_stream = __commonJS((exports, module) => {
       validateBoolean(opts.cleanup, "cleanup");
       autoCleanup = opts.cleanup;
     }
-    return new Promise2((resolve9, reject) => {
+    return new Promise2((resolve10, reject) => {
       const cleanup = eos(stream, opts, (err) => {
         if (autoCleanup) {
           cleanup();
@@ -27400,7 +27400,7 @@ var require_end_of_stream = __commonJS((exports, module) => {
         if (err) {
           reject(err);
         } else {
-          resolve9();
+          resolve10();
         }
       });
     });
@@ -28562,7 +28562,7 @@ var require_readable3 = __commonJS((exports, module) => {
       error51 = this.readableEnded ? null : new AbortError;
       this.destroy(error51);
     }
-    return new Promise2((resolve9, reject) => eos(this, (err) => err && err !== error51 ? reject(err) : resolve9(null)));
+    return new Promise2((resolve10, reject) => eos(this, (err) => err && err !== error51 ? reject(err) : resolve10(null)));
   };
   Readable.prototype.push = function(chunk, encoding) {
     return readableAddChunk(this, chunk, encoding, false);
@@ -29140,12 +29140,12 @@ var require_readable3 = __commonJS((exports, module) => {
   }
   async function* createAsyncIterator(stream, options) {
     let callback2 = nop;
-    function next(resolve9) {
+    function next(resolve10) {
       if (this === stream) {
         callback2();
         callback2 = nop;
       } else {
-        callback2 = resolve9;
+        callback2 = resolve10;
       }
     }
     stream.on("readable", next);
@@ -30181,7 +30181,7 @@ var require_duplexify = __commonJS((exports, module) => {
     ], body);
   };
   function fromAsyncGen(fn2) {
-    let { promise: promise3, resolve: resolve9 } = createDeferredPromise();
+    let { promise: promise3, resolve: resolve10 } = createDeferredPromise();
     const ac = new AbortController2;
     const signal = ac.signal;
     const value = fn2(async function* () {
@@ -30196,7 +30196,7 @@ var require_duplexify = __commonJS((exports, module) => {
           throw new AbortError(undefined, {
             cause: signal.reason
           });
-        ({ promise: promise3, resolve: resolve9 } = createDeferredPromise());
+        ({ promise: promise3, resolve: resolve10 } = createDeferredPromise());
         yield chunk;
       }
     }(), {
@@ -30205,8 +30205,8 @@ var require_duplexify = __commonJS((exports, module) => {
     return {
       value,
       write(chunk, encoding, cb) {
-        const _resolve = resolve9;
-        resolve9 = null;
+        const _resolve = resolve10;
+        resolve10 = null;
         _resolve({
           chunk,
           done: false,
@@ -30214,8 +30214,8 @@ var require_duplexify = __commonJS((exports, module) => {
         });
       },
       final(cb) {
-        const _resolve = resolve9;
-        resolve9 = null;
+        const _resolve = resolve10;
+        resolve10 = null;
         _resolve({
           done: true,
           cb
@@ -30652,7 +30652,7 @@ var require_pipeline = __commonJS((exports, module) => {
         callback2();
       }
     };
-    const wait = () => new Promise2((resolve9, reject) => {
+    const wait = () => new Promise2((resolve10, reject) => {
       if (error51) {
         reject(error51);
       } else {
@@ -30660,7 +30660,7 @@ var require_pipeline = __commonJS((exports, module) => {
           if (error51) {
             reject(error51);
           } else {
-            resolve9();
+            resolve10();
           }
         };
       }
@@ -31267,8 +31267,8 @@ var require_operators = __commonJS((exports, module) => {
               next = null;
             }
             if (!done && (queue.length >= highWaterMark || cnt >= concurrency)) {
-              await new Promise2((resolve9) => {
-                resume = resolve9;
+              await new Promise2((resolve10) => {
+                resume = resolve10;
               });
             }
           }
@@ -31302,8 +31302,8 @@ var require_operators = __commonJS((exports, module) => {
             queue.shift();
             maybeResume();
           }
-          await new Promise2((resolve9) => {
-            next = resolve9;
+          await new Promise2((resolve10) => {
+            next = resolve10;
           });
         }
       } finally {
@@ -31555,7 +31555,7 @@ var require_promises = __commonJS((exports, module) => {
   var { finished } = require_end_of_stream();
   require_stream();
   function pipeline(...streams) {
-    return new Promise2((resolve9, reject) => {
+    return new Promise2((resolve10, reject) => {
       let signal;
       let end;
       const lastArg = streams[streams.length - 1];
@@ -31568,7 +31568,7 @@ var require_promises = __commonJS((exports, module) => {
         if (err) {
           reject(err);
         } else {
-          resolve9(value);
+          resolve10(value);
         }
       }, {
         signal,
@@ -35801,10 +35801,10 @@ var require_commonjs3 = __commonJS((exports) => {
       return this[ENCODING] ? buf.join("") : Buffer.concat(buf, buf.dataLength);
     }
     async promise() {
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve10, reject) => {
         this.on(DESTROYED, () => reject(new Error("stream destroyed")));
         this.on("error", (er2) => reject(er2));
-        this.on("end", () => resolve9());
+        this.on("end", () => resolve10());
       });
     }
     [Symbol.asyncIterator]() {
@@ -35823,7 +35823,7 @@ var require_commonjs3 = __commonJS((exports) => {
           return Promise.resolve({ done: false, value: res });
         if (this[EOF])
           return stop();
-        let resolve9;
+        let resolve10;
         let reject;
         const onerr = (er2) => {
           this.off("data", ondata);
@@ -35837,19 +35837,19 @@ var require_commonjs3 = __commonJS((exports) => {
           this.off("end", onend);
           this.off(DESTROYED, ondestroy);
           this.pause();
-          resolve9({ value, done: !!this[EOF] });
+          resolve10({ value, done: !!this[EOF] });
         };
         const onend = () => {
           this.off("error", onerr);
           this.off("data", ondata);
           this.off(DESTROYED, ondestroy);
           stop();
-          resolve9({ done: true, value: undefined });
+          resolve10({ done: true, value: undefined });
         };
         const ondestroy = () => onerr(new Error("stream destroyed"));
         return new Promise((res2, rej) => {
           reject = rej;
-          resolve9 = res2;
+          resolve10 = res2;
           this.once(DESTROYED, ondestroy);
           this.once("error", onerr);
           this.once("end", onend);
@@ -36597,8 +36597,8 @@ var require_commonjs4 = __commonJS((exports) => {
       if (this.#asyncReaddirInFlight) {
         await this.#asyncReaddirInFlight;
       } else {
-        let resolve9 = () => {};
-        this.#asyncReaddirInFlight = new Promise((res) => resolve9 = res);
+        let resolve10 = () => {};
+        this.#asyncReaddirInFlight = new Promise((res) => resolve10 = res);
         try {
           for (const e of await this.#fs.promises.readdir(fullpath, {
             withFileTypes: true
@@ -36611,7 +36611,7 @@ var require_commonjs4 = __commonJS((exports) => {
           children.provisional = 0;
         }
         this.#asyncReaddirInFlight = undefined;
-        resolve9();
+        resolve10();
       }
       return children.slice(0, children.provisional);
     }
@@ -39134,25 +39134,25 @@ var require_util4 = __commonJS((exports, module) => {
       };
     },
     createDeferredPromise: function() {
-      let resolve9;
+      let resolve10;
       let reject;
       const promise3 = new Promise((res, rej) => {
-        resolve9 = res;
+        resolve10 = res;
         reject = rej;
       });
       return {
         promise: promise3,
-        resolve: resolve9,
+        resolve: resolve10,
         reject
       };
     },
     promisify(fn2) {
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve10, reject) => {
         fn2((err, ...args) => {
           if (err) {
             return reject(err);
           }
-          return resolve9(...args);
+          return resolve10(...args);
         });
       });
     },
@@ -39937,7 +39937,7 @@ var require_end_of_stream2 = __commonJS((exports, module) => {
       validateBoolean(opts.cleanup, "cleanup");
       autoCleanup = opts.cleanup;
     }
-    return new Promise2((resolve9, reject) => {
+    return new Promise2((resolve10, reject) => {
       const cleanup = eos(stream, opts, (err) => {
         if (autoCleanup) {
           cleanup();
@@ -39945,7 +39945,7 @@ var require_end_of_stream2 = __commonJS((exports, module) => {
         if (err) {
           reject(err);
         } else {
-          resolve9();
+          resolve10();
         }
       });
     });
@@ -40793,7 +40793,7 @@ var require_readable4 = __commonJS((exports, module) => {
       error51 = this.readableEnded ? null : new AbortError;
       this.destroy(error51);
     }
-    return new Promise2((resolve9, reject) => eos(this, (err) => err && err !== error51 ? reject(err) : resolve9(null)));
+    return new Promise2((resolve10, reject) => eos(this, (err) => err && err !== error51 ? reject(err) : resolve10(null)));
   };
   Readable.prototype.push = function(chunk, encoding) {
     return readableAddChunk(this, chunk, encoding, false);
@@ -41371,12 +41371,12 @@ var require_readable4 = __commonJS((exports, module) => {
   }
   async function* createAsyncIterator(stream, options) {
     let callback2 = nop;
-    function next(resolve9) {
+    function next(resolve10) {
       if (this === stream) {
         callback2();
         callback2 = nop;
       } else {
-        callback2 = resolve9;
+        callback2 = resolve10;
       }
     }
     stream.on("readable", next);
@@ -42412,7 +42412,7 @@ var require_duplexify2 = __commonJS((exports, module) => {
     ], body);
   };
   function fromAsyncGen(fn2) {
-    let { promise: promise3, resolve: resolve9 } = createDeferredPromise();
+    let { promise: promise3, resolve: resolve10 } = createDeferredPromise();
     const ac = new AbortController2;
     const signal = ac.signal;
     const value = fn2(async function* () {
@@ -42427,7 +42427,7 @@ var require_duplexify2 = __commonJS((exports, module) => {
           throw new AbortError(undefined, {
             cause: signal.reason
           });
-        ({ promise: promise3, resolve: resolve9 } = createDeferredPromise());
+        ({ promise: promise3, resolve: resolve10 } = createDeferredPromise());
         yield chunk;
       }
     }(), {
@@ -42436,8 +42436,8 @@ var require_duplexify2 = __commonJS((exports, module) => {
     return {
       value,
       write(chunk, encoding, cb) {
-        const _resolve = resolve9;
-        resolve9 = null;
+        const _resolve = resolve10;
+        resolve10 = null;
         _resolve({
           chunk,
           done: false,
@@ -42445,8 +42445,8 @@ var require_duplexify2 = __commonJS((exports, module) => {
         });
       },
       final(cb) {
-        const _resolve = resolve9;
-        resolve9 = null;
+        const _resolve = resolve10;
+        resolve10 = null;
         _resolve({
           done: true,
           cb
@@ -42883,7 +42883,7 @@ var require_pipeline2 = __commonJS((exports, module) => {
         callback2();
       }
     };
-    const wait = () => new Promise2((resolve9, reject) => {
+    const wait = () => new Promise2((resolve10, reject) => {
       if (error51) {
         reject(error51);
       } else {
@@ -42891,7 +42891,7 @@ var require_pipeline2 = __commonJS((exports, module) => {
           if (error51) {
             reject(error51);
           } else {
-            resolve9();
+            resolve10();
           }
         };
       }
@@ -43498,8 +43498,8 @@ var require_operators2 = __commonJS((exports, module) => {
               next = null;
             }
             if (!done && (queue.length >= highWaterMark || cnt >= concurrency)) {
-              await new Promise2((resolve9) => {
-                resume = resolve9;
+              await new Promise2((resolve10) => {
+                resume = resolve10;
               });
             }
           }
@@ -43533,8 +43533,8 @@ var require_operators2 = __commonJS((exports, module) => {
             queue.shift();
             maybeResume();
           }
-          await new Promise2((resolve9) => {
-            next = resolve9;
+          await new Promise2((resolve10) => {
+            next = resolve10;
           });
         }
       } finally {
@@ -43786,7 +43786,7 @@ var require_promises2 = __commonJS((exports, module) => {
   var { finished } = require_end_of_stream2();
   require_stream2();
   function pipeline(...streams) {
-    return new Promise2((resolve9, reject) => {
+    return new Promise2((resolve10, reject) => {
       let signal;
       let end;
       const lastArg = streams[streams.length - 1];
@@ -43799,7 +43799,7 @@ var require_promises2 = __commonJS((exports, module) => {
         if (err) {
           reject(err);
         } else {
-          resolve9(value);
+          resolve10(value);
         }
       }, {
         signal,
@@ -44447,11 +44447,11 @@ var require_core = __commonJS((exports, module) => {
       this._finalize();
     }
     var self2 = this;
-    return new Promise(function(resolve9, reject) {
+    return new Promise(function(resolve10, reject) {
       var errored;
       self2._module.on("end", function() {
         if (!errored) {
-          resolve9();
+          resolve10();
         }
       });
       self2._module.on("error", function(err) {
@@ -45397,25 +45397,25 @@ var require_util6 = __commonJS((exports, module) => {
       };
     },
     createDeferredPromise: function() {
-      let resolve9;
+      let resolve10;
       let reject;
       const promise3 = new Promise((res, rej) => {
-        resolve9 = res;
+        resolve10 = res;
         reject = rej;
       });
       return {
         promise: promise3,
-        resolve: resolve9,
+        resolve: resolve10,
         reject
       };
     },
     promisify(fn2) {
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve10, reject) => {
         fn2((err, ...args) => {
           if (err) {
             return reject(err);
           }
-          return resolve9(...args);
+          return resolve10(...args);
         });
       });
     },
@@ -46200,7 +46200,7 @@ var require_end_of_stream3 = __commonJS((exports, module) => {
       validateBoolean(opts.cleanup, "cleanup");
       autoCleanup = opts.cleanup;
     }
-    return new Promise2((resolve9, reject) => {
+    return new Promise2((resolve10, reject) => {
       const cleanup = eos(stream, opts, (err) => {
         if (autoCleanup) {
           cleanup();
@@ -46208,7 +46208,7 @@ var require_end_of_stream3 = __commonJS((exports, module) => {
         if (err) {
           reject(err);
         } else {
-          resolve9();
+          resolve10();
         }
       });
     });
@@ -47056,7 +47056,7 @@ var require_readable5 = __commonJS((exports, module) => {
       error51 = this.readableEnded ? null : new AbortError;
       this.destroy(error51);
     }
-    return new Promise2((resolve9, reject) => eos(this, (err) => err && err !== error51 ? reject(err) : resolve9(null)));
+    return new Promise2((resolve10, reject) => eos(this, (err) => err && err !== error51 ? reject(err) : resolve10(null)));
   };
   Readable.prototype.push = function(chunk, encoding) {
     return readableAddChunk(this, chunk, encoding, false);
@@ -47634,12 +47634,12 @@ var require_readable5 = __commonJS((exports, module) => {
   }
   async function* createAsyncIterator(stream, options) {
     let callback2 = nop;
-    function next(resolve9) {
+    function next(resolve10) {
       if (this === stream) {
         callback2();
         callback2 = nop;
       } else {
-        callback2 = resolve9;
+        callback2 = resolve10;
       }
     }
     stream.on("readable", next);
@@ -48675,7 +48675,7 @@ var require_duplexify3 = __commonJS((exports, module) => {
     ], body);
   };
   function fromAsyncGen(fn2) {
-    let { promise: promise3, resolve: resolve9 } = createDeferredPromise();
+    let { promise: promise3, resolve: resolve10 } = createDeferredPromise();
     const ac = new AbortController2;
     const signal = ac.signal;
     const value = fn2(async function* () {
@@ -48690,7 +48690,7 @@ var require_duplexify3 = __commonJS((exports, module) => {
           throw new AbortError(undefined, {
             cause: signal.reason
           });
-        ({ promise: promise3, resolve: resolve9 } = createDeferredPromise());
+        ({ promise: promise3, resolve: resolve10 } = createDeferredPromise());
         yield chunk;
       }
     }(), {
@@ -48699,8 +48699,8 @@ var require_duplexify3 = __commonJS((exports, module) => {
     return {
       value,
       write(chunk, encoding, cb) {
-        const _resolve = resolve9;
-        resolve9 = null;
+        const _resolve = resolve10;
+        resolve10 = null;
         _resolve({
           chunk,
           done: false,
@@ -48708,8 +48708,8 @@ var require_duplexify3 = __commonJS((exports, module) => {
         });
       },
       final(cb) {
-        const _resolve = resolve9;
-        resolve9 = null;
+        const _resolve = resolve10;
+        resolve10 = null;
         _resolve({
           done: true,
           cb
@@ -49146,7 +49146,7 @@ var require_pipeline3 = __commonJS((exports, module) => {
         callback2();
       }
     };
-    const wait = () => new Promise2((resolve9, reject) => {
+    const wait = () => new Promise2((resolve10, reject) => {
       if (error51) {
         reject(error51);
       } else {
@@ -49154,7 +49154,7 @@ var require_pipeline3 = __commonJS((exports, module) => {
           if (error51) {
             reject(error51);
           } else {
-            resolve9();
+            resolve10();
           }
         };
       }
@@ -49761,8 +49761,8 @@ var require_operators3 = __commonJS((exports, module) => {
               next = null;
             }
             if (!done && (queue.length >= highWaterMark || cnt >= concurrency)) {
-              await new Promise2((resolve9) => {
-                resume = resolve9;
+              await new Promise2((resolve10) => {
+                resume = resolve10;
               });
             }
           }
@@ -49796,8 +49796,8 @@ var require_operators3 = __commonJS((exports, module) => {
             queue.shift();
             maybeResume();
           }
-          await new Promise2((resolve9) => {
-            next = resolve9;
+          await new Promise2((resolve10) => {
+            next = resolve10;
           });
         }
       } finally {
@@ -50049,7 +50049,7 @@ var require_promises3 = __commonJS((exports, module) => {
   var { finished } = require_end_of_stream3();
   require_stream3();
   function pipeline(...streams) {
-    return new Promise2((resolve9, reject) => {
+    return new Promise2((resolve10, reject) => {
       let signal;
       let end;
       const lastArg = streams[streams.length - 1];
@@ -50062,7 +50062,7 @@ var require_promises3 = __commonJS((exports, module) => {
         if (err) {
           reject(err);
         } else {
-          resolve9(value);
+          resolve10(value);
         }
       }, {
         signal,
@@ -50954,25 +50954,25 @@ var require_util8 = __commonJS((exports, module) => {
       };
     },
     createDeferredPromise: function() {
-      let resolve9;
+      let resolve10;
       let reject;
       const promise3 = new Promise((res, rej) => {
-        resolve9 = res;
+        resolve10 = res;
         reject = rej;
       });
       return {
         promise: promise3,
-        resolve: resolve9,
+        resolve: resolve10,
         reject
       };
     },
     promisify(fn2) {
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve10, reject) => {
         fn2((err, ...args) => {
           if (err) {
             return reject(err);
           }
-          return resolve9(...args);
+          return resolve10(...args);
         });
       });
     },
@@ -51757,7 +51757,7 @@ var require_end_of_stream4 = __commonJS((exports, module) => {
       validateBoolean(opts.cleanup, "cleanup");
       autoCleanup = opts.cleanup;
     }
-    return new Promise2((resolve9, reject) => {
+    return new Promise2((resolve10, reject) => {
       const cleanup = eos(stream, opts, (err) => {
         if (autoCleanup) {
           cleanup();
@@ -51765,7 +51765,7 @@ var require_end_of_stream4 = __commonJS((exports, module) => {
         if (err) {
           reject(err);
         } else {
-          resolve9();
+          resolve10();
         }
       });
     });
@@ -52613,7 +52613,7 @@ var require_readable6 = __commonJS((exports, module) => {
       error51 = this.readableEnded ? null : new AbortError;
       this.destroy(error51);
     }
-    return new Promise2((resolve9, reject) => eos(this, (err) => err && err !== error51 ? reject(err) : resolve9(null)));
+    return new Promise2((resolve10, reject) => eos(this, (err) => err && err !== error51 ? reject(err) : resolve10(null)));
   };
   Readable.prototype.push = function(chunk, encoding) {
     return readableAddChunk(this, chunk, encoding, false);
@@ -53191,12 +53191,12 @@ var require_readable6 = __commonJS((exports, module) => {
   }
   async function* createAsyncIterator(stream, options) {
     let callback2 = nop;
-    function next(resolve9) {
+    function next(resolve10) {
       if (this === stream) {
         callback2();
         callback2 = nop;
       } else {
-        callback2 = resolve9;
+        callback2 = resolve10;
       }
     }
     stream.on("readable", next);
@@ -54232,7 +54232,7 @@ var require_duplexify4 = __commonJS((exports, module) => {
     ], body);
   };
   function fromAsyncGen(fn2) {
-    let { promise: promise3, resolve: resolve9 } = createDeferredPromise();
+    let { promise: promise3, resolve: resolve10 } = createDeferredPromise();
     const ac = new AbortController2;
     const signal = ac.signal;
     const value = fn2(async function* () {
@@ -54247,7 +54247,7 @@ var require_duplexify4 = __commonJS((exports, module) => {
           throw new AbortError(undefined, {
             cause: signal.reason
           });
-        ({ promise: promise3, resolve: resolve9 } = createDeferredPromise());
+        ({ promise: promise3, resolve: resolve10 } = createDeferredPromise());
         yield chunk;
       }
     }(), {
@@ -54256,8 +54256,8 @@ var require_duplexify4 = __commonJS((exports, module) => {
     return {
       value,
       write(chunk, encoding, cb) {
-        const _resolve = resolve9;
-        resolve9 = null;
+        const _resolve = resolve10;
+        resolve10 = null;
         _resolve({
           chunk,
           done: false,
@@ -54265,8 +54265,8 @@ var require_duplexify4 = __commonJS((exports, module) => {
         });
       },
       final(cb) {
-        const _resolve = resolve9;
-        resolve9 = null;
+        const _resolve = resolve10;
+        resolve10 = null;
         _resolve({
           done: true,
           cb
@@ -54703,7 +54703,7 @@ var require_pipeline4 = __commonJS((exports, module) => {
         callback2();
       }
     };
-    const wait = () => new Promise2((resolve9, reject) => {
+    const wait = () => new Promise2((resolve10, reject) => {
       if (error51) {
         reject(error51);
       } else {
@@ -54711,7 +54711,7 @@ var require_pipeline4 = __commonJS((exports, module) => {
           if (error51) {
             reject(error51);
           } else {
-            resolve9();
+            resolve10();
           }
         };
       }
@@ -55318,8 +55318,8 @@ var require_operators4 = __commonJS((exports, module) => {
               next = null;
             }
             if (!done && (queue.length >= highWaterMark || cnt >= concurrency)) {
-              await new Promise2((resolve9) => {
-                resume = resolve9;
+              await new Promise2((resolve10) => {
+                resume = resolve10;
               });
             }
           }
@@ -55353,8 +55353,8 @@ var require_operators4 = __commonJS((exports, module) => {
             queue.shift();
             maybeResume();
           }
-          await new Promise2((resolve9) => {
-            next = resolve9;
+          await new Promise2((resolve10) => {
+            next = resolve10;
           });
         }
       } finally {
@@ -55606,7 +55606,7 @@ var require_promises4 = __commonJS((exports, module) => {
   var { finished } = require_end_of_stream4();
   require_stream4();
   function pipeline(...streams) {
-    return new Promise2((resolve9, reject) => {
+    return new Promise2((resolve10, reject) => {
       let signal;
       let end;
       const lastArg = streams[streams.length - 1];
@@ -55619,7 +55619,7 @@ var require_promises4 = __commonJS((exports, module) => {
         if (err) {
           reject(err);
         } else {
-          resolve9(value);
+          resolve10(value);
         }
       }, {
         signal,
@@ -57564,8 +57564,8 @@ var require_streamx = __commonJS((exports, module) => {
           return this;
         },
         next() {
-          return new Promise(function(resolve9, reject) {
-            promiseResolve = resolve9;
+          return new Promise(function(resolve10, reject) {
+            promiseResolve = resolve10;
             promiseReject = reject;
             const data = stream.read();
             if (data !== null)
@@ -57602,14 +57602,14 @@ var require_streamx = __commonJS((exports, module) => {
       }
       function destroy(err) {
         stream.destroy(err);
-        return new Promise((resolve9, reject) => {
+        return new Promise((resolve10, reject) => {
           if (stream._duplexState & DESTROYED)
-            return resolve9({ value: undefined, done: true });
+            return resolve10({ value: undefined, done: true });
           stream.once("close", function() {
             if (err)
               reject(err);
             else
-              resolve9({ value: undefined, done: true });
+              resolve10({ value: undefined, done: true });
           });
         });
       }
@@ -57661,8 +57661,8 @@ var require_streamx = __commonJS((exports, module) => {
         return Promise.resolve(true);
       if (state.drains === null)
         state.drains = [];
-      return new Promise((resolve9) => {
-        state.drains.push({ writes, resolve: resolve9 });
+      return new Promise((resolve10) => {
+        state.drains.push({ writes, resolve: resolve10 });
       });
     }
     write(data) {
@@ -57776,11 +57776,11 @@ var require_streamx = __commonJS((exports, module) => {
     cb(null);
   }
   function pipelinePromise(...streams) {
-    return new Promise((resolve9, reject) => {
+    return new Promise((resolve10, reject) => {
       return pipeline(...streams, (err) => {
         if (err)
           return reject(err);
-        resolve9();
+        resolve10();
       });
     });
   }
@@ -58505,16 +58505,16 @@ var require_extract = __commonJS((exports, module) => {
         entryCallback = null;
         cb(err);
       }
-      function onnext(resolve9, reject) {
+      function onnext(resolve10, reject) {
         if (error51) {
           return reject(error51);
         }
         if (entryStream) {
-          resolve9({ value: entryStream, done: false });
+          resolve10({ value: entryStream, done: false });
           entryStream = null;
           return;
         }
-        promiseResolve = resolve9;
+        promiseResolve = resolve10;
         promiseReject = reject;
         consumeCallback(null);
         if (extract._finished && promiseResolve) {
@@ -58545,14 +58545,14 @@ var require_extract = __commonJS((exports, module) => {
       function destroy(err) {
         extract.destroy(err);
         consumeCallback(err);
-        return new Promise((resolve9, reject) => {
+        return new Promise((resolve10, reject) => {
           if (extract.destroyed)
-            return resolve9({ value: undefined, done: true });
+            return resolve10({ value: undefined, done: true });
           extract.once("close", function() {
             if (err)
               reject(err);
             else
-              resolve9({ value: undefined, done: true });
+              resolve10({ value: undefined, done: true });
           });
         });
       }
@@ -59703,7 +59703,7 @@ async function executeHooksWithArgs(hookName, hooks = [], args = []) {
       return true;
     }
   };
-  const hooksPromises = hooks.map((hook) => new Promise((resolve9, reject) => {
+  const hooksPromises = hooks.map((hook) => new Promise((resolve10, reject) => {
     let result2;
     try {
       result2 = hook.apply(this, args);
@@ -59712,18 +59712,18 @@ async function executeHooksWithArgs(hookName, hooks = [], args = []) {
         return;
       }
       log32.error(e.stack);
-      return resolve9(e);
+      return resolve10(e);
     }
     if (result2 && typeof result2.then === "function") {
-      return result2.then(resolve9, (e) => {
+      return result2.then(resolve10, (e) => {
         if (rejectIfSkipped(e, reject)) {
           return;
         }
         log32.error(e.stack || e.message);
-        resolve9(e);
+        resolve10(e);
       });
     }
-    resolve9(result2);
+    resolve10(result2);
   }));
   const start = Date.now();
   const result = await Promise.all(hooksPromises);
@@ -60018,17 +60018,17 @@ var __defProp2, __export2 = (target, all) => {
   }
   return result;
 }, find2 = (array2, callback2, thisArg) => {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     if (array2.length === 0) {
-      return resolve9(undefined);
+      return resolve10(undefined);
     }
     let counter = 1;
     for (let i2 = 0;i2 < array2.length; i2++) {
       const check2 = (found) => {
         if (found) {
-          resolve9(array2[i2]);
+          resolve10(array2[i2]);
         } else if (counter === array2.length) {
-          resolve9(undefined);
+          resolve10(undefined);
         }
         counter++;
       };
@@ -60042,17 +60042,17 @@ var __defProp2, __export2 = (target, all) => {
     }
   }
 }, findIndex = (array2, callback2, thisArg) => {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     if (array2.length === 0) {
-      return resolve9(-1);
+      return resolve10(-1);
     }
     let counter = 1;
     for (let i2 = 0;i2 < array2.length; i2++) {
       const check2 = (found) => {
         if (found) {
-          resolve9(i2);
+          resolve10(i2);
         } else if (counter === array2.length) {
-          resolve9(-1);
+          resolve10(-1);
         }
         counter++;
       };
@@ -60066,9 +60066,9 @@ var __defProp2, __export2 = (target, all) => {
     }
   }
 }, some = (array2, callback2, thisArg) => {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     if (array2.length === 0) {
-      return resolve9(false);
+      return resolve10(false);
     }
     let counter = 1;
     for (let i2 = 0;i2 < array2.length; i2++) {
@@ -60078,9 +60078,9 @@ var __defProp2, __export2 = (target, all) => {
       }
       const check2 = (found) => {
         if (found) {
-          resolve9(true);
+          resolve10(true);
         } else if (counter === array2.length) {
-          resolve9(false);
+          resolve10(false);
         }
         counter++;
       };
@@ -60095,9 +60095,9 @@ var __defProp2, __export2 = (target, all) => {
   }
   return false;
 }, every = (array2, callback2, thisArg) => {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     if (array2.length === 0) {
-      return resolve9(true);
+      return resolve10(true);
     }
     let counter = 1;
     for (let i2 = 0;i2 < array2.length; i2++) {
@@ -60107,9 +60107,9 @@ var __defProp2, __export2 = (target, all) => {
       }
       const check2 = (found) => {
         if (!found) {
-          resolve9(false);
+          resolve10(false);
         } else if (counter === array2.length) {
-          resolve9(true);
+          resolve10(true);
         }
         counter++;
       };
@@ -60124,7 +60124,7 @@ var __defProp2, __export2 = (target, all) => {
   }
   return true;
 }, filter = (array2, callback2, thisArg) => {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     const promiseArray = [];
     for (let i2 = 0;i2 < array2.length; i2++) {
       if (i2 in array2) {
@@ -60138,7 +60138,7 @@ var __defProp2, __export2 = (target, all) => {
         return await array2[i2];
       }
       return;
-    })).then((result) => result.filter((val) => typeof val !== "undefined")).then(resolve9, reject);
+    })).then((result) => result.filter((val) => typeof val !== "undefined")).then(resolve10, reject);
   });
 }, filterSeries = async (array2, callback2, thisArg) => {
   const result = [];
@@ -61984,7 +61984,7 @@ var require_websocket = __commonJS((exports, module) => {
   var http = __require("http");
   var net2 = __require("net");
   var tls = __require("tls");
-  var { randomBytes: randomBytes4, createHash: createHash4 } = __require("crypto");
+  var { randomBytes: randomBytes4, createHash: createHash5 } = __require("crypto");
   var { Duplex, Readable } = __require("stream");
   var { URL: URL2 } = __require("url");
   var PerMessageDeflate = require_permessage_deflate();
@@ -62523,7 +62523,7 @@ var require_websocket = __commonJS((exports, module) => {
         abortHandshake(websocket, socket, "Invalid Upgrade header");
         return;
       }
-      const digest = createHash4("sha1").update(key + GUID).digest("base64");
+      const digest = createHash5("sha1").update(key + GUID).digest("base64");
       if (res.headers["sec-websocket-accept"] !== digest) {
         abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
         return;
@@ -62896,7 +62896,7 @@ var require_websocket_server = __commonJS((exports, module) => {
   var EventEmitter = __require("events");
   var http = __require("http");
   var { Duplex } = __require("stream");
-  var { createHash: createHash4 } = __require("crypto");
+  var { createHash: createHash5 } = __require("crypto");
   var extension = require_extension();
   var PerMessageDeflate = require_permessage_deflate();
   var subprotocol = require_subprotocol();
@@ -63109,7 +63109,7 @@ var require_websocket_server = __commonJS((exports, module) => {
       }
       if (this._state > RUNNING)
         return abortHandshake(socket, 503);
-      const digest = createHash4("sha1").update(key + GUID).digest("base64");
+      const digest = createHash5("sha1").update(key + GUID).digest("base64");
       const headers = [
         "HTTP/1.1 101 Switching Protocols",
         "Upgrade: websocket",
@@ -71654,9 +71654,9 @@ var require_dispatcher_base = __commonJS((exports, module) => {
     }
     close(callback2) {
       if (callback2 === undefined) {
-        return new Promise((resolve9, reject) => {
+        return new Promise((resolve10, reject) => {
           this.close((err, data) => {
-            return err ? reject(err) : resolve9(data);
+            return err ? reject(err) : resolve10(data);
           });
         });
       }
@@ -71694,9 +71694,9 @@ var require_dispatcher_base = __commonJS((exports, module) => {
         err = null;
       }
       if (callback2 === undefined) {
-        return new Promise((resolve9, reject) => {
+        return new Promise((resolve10, reject) => {
           this.destroy(err, (err2, data) => {
-            return err2 ? reject(err2) : resolve9(data);
+            return err2 ? reject(err2) : resolve10(data);
           });
         });
       }
@@ -73702,8 +73702,8 @@ var require_util10 = __commonJS((exports, module) => {
   function createDeferredPromise() {
     let res;
     let rej;
-    const promise3 = new Promise((resolve9, reject) => {
-      res = resolve9;
+    const promise3 = new Promise((resolve10, reject) => {
+      res = resolve10;
       rej = reject;
     });
     return { promise: promise3, resolve: res, reject: rej };
@@ -75756,12 +75756,12 @@ upgrade: ${upgrade}\r
         cb();
       }
     }
-    const waitForDrain = () => new Promise((resolve9, reject) => {
+    const waitForDrain = () => new Promise((resolve10, reject) => {
       assert2(callback2 === null);
       if (socket[kError]) {
         reject(socket[kError]);
       } else {
-        callback2 = resolve9;
+        callback2 = resolve10;
       }
     });
     socket.on("close", onDrain).on("drain", onDrain);
@@ -76342,12 +76342,12 @@ var require_client_h2 = __commonJS((exports, module) => {
         cb();
       }
     }
-    const waitForDrain = () => new Promise((resolve9, reject) => {
+    const waitForDrain = () => new Promise((resolve10, reject) => {
       assert2(callback2 === null);
       if (socket[kError]) {
         reject(socket[kError]);
       } else {
-        callback2 = resolve9;
+        callback2 = resolve10;
       }
     });
     h2stream.on("close", onDrain).on("drain", onDrain);
@@ -76807,16 +76807,16 @@ var require_client = __commonJS((exports, module) => {
       return this[kNeedDrain] < 2;
     }
     async[kClose]() {
-      return new Promise((resolve9) => {
+      return new Promise((resolve10) => {
         if (this[kSize]) {
-          this[kClosedResolve] = resolve9;
+          this[kClosedResolve] = resolve10;
         } else {
-          resolve9(null);
+          resolve10(null);
         }
       });
     }
     async[kDestroy](err) {
-      return new Promise((resolve9) => {
+      return new Promise((resolve10) => {
         const requests = this[kQueue].splice(this[kPendingIdx]);
         for (let i2 = 0;i2 < requests.length; i2++) {
           const request = requests[i2];
@@ -76827,7 +76827,7 @@ var require_client = __commonJS((exports, module) => {
             this[kClosedResolve]();
             this[kClosedResolve] = null;
           }
-          resolve9(null);
+          resolve10(null);
         };
         if (this[kHTTPContext]) {
           this[kHTTPContext].destroy(err, callback2);
@@ -76878,7 +76878,7 @@ var require_client = __commonJS((exports, module) => {
       });
     }
     try {
-      const socket = await new Promise((resolve9, reject) => {
+      const socket = await new Promise((resolve10, reject) => {
         client[kConnector]({
           host,
           hostname: hostname3,
@@ -76890,7 +76890,7 @@ var require_client = __commonJS((exports, module) => {
           if (err) {
             reject(err);
           } else {
-            resolve9(socket2);
+            resolve10(socket2);
           }
         });
       });
@@ -77221,8 +77221,8 @@ var require_pool_base = __commonJS((exports, module) => {
       if (this[kQueue].isEmpty()) {
         await Promise.all(this[kClients].map((c2) => c2.close()));
       } else {
-        await new Promise((resolve9) => {
-          this[kClosedResolve] = resolve9;
+        await new Promise((resolve10) => {
+          this[kClosedResolve] = resolve10;
         });
       }
     }
@@ -78367,7 +78367,7 @@ var require_readable7 = __commonJS((exports, module) => {
       if (this._readableState.closeEmitted) {
         return null;
       }
-      return await new Promise((resolve9, reject) => {
+      return await new Promise((resolve10, reject) => {
         if (this[kContentLength] > limit) {
           this.destroy(new AbortError);
         }
@@ -78380,7 +78380,7 @@ var require_readable7 = __commonJS((exports, module) => {
           if (signal?.aborted) {
             reject(signal.reason ?? new AbortError);
           } else {
-            resolve9(null);
+            resolve10(null);
           }
         }).on("error", noop).on("data", function(chunk) {
           limit -= chunk.length;
@@ -78399,7 +78399,7 @@ var require_readable7 = __commonJS((exports, module) => {
   }
   async function consume(stream, type) {
     assert2(!stream[kConsume]);
-    return new Promise((resolve9, reject) => {
+    return new Promise((resolve10, reject) => {
       if (isUnusable(stream)) {
         const rState = stream._readableState;
         if (rState.destroyed && rState.closeEmitted === false) {
@@ -78416,7 +78416,7 @@ var require_readable7 = __commonJS((exports, module) => {
           stream[kConsume] = {
             type,
             stream,
-            resolve: resolve9,
+            resolve: resolve10,
             reject,
             length: 0,
             body: []
@@ -78485,18 +78485,18 @@ var require_readable7 = __commonJS((exports, module) => {
     return buffer;
   }
   function consumeEnd(consume2) {
-    const { type, body, resolve: resolve9, stream, length } = consume2;
+    const { type, body, resolve: resolve10, stream, length } = consume2;
     try {
       if (type === "text") {
-        resolve9(chunksDecode(body, length));
+        resolve10(chunksDecode(body, length));
       } else if (type === "json") {
-        resolve9(JSON.parse(chunksDecode(body, length)));
+        resolve10(JSON.parse(chunksDecode(body, length)));
       } else if (type === "arrayBuffer") {
-        resolve9(chunksConcat(body, length).buffer);
+        resolve10(chunksConcat(body, length).buffer);
       } else if (type === "blob") {
-        resolve9(new Blob(body, { type: stream[kContentType] }));
+        resolve10(new Blob(body, { type: stream[kContentType] }));
       } else if (type === "bytes") {
-        resolve9(chunksConcat(body, length));
+        resolve10(chunksConcat(body, length));
       }
       consumeFinish(consume2);
     } catch (err) {
@@ -78744,9 +78744,9 @@ var require_api_request = __commonJS((exports, module) => {
   }
   function request(opts, callback2) {
     if (callback2 === undefined) {
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve10, reject) => {
         request.call(this, opts, (err, data) => {
-          return err ? reject(err) : resolve9(data);
+          return err ? reject(err) : resolve10(data);
         });
       });
     }
@@ -78961,9 +78961,9 @@ var require_api_stream = __commonJS((exports, module) => {
   }
   function stream(opts, factory, callback2) {
     if (callback2 === undefined) {
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve10, reject) => {
         stream.call(this, opts, factory, (err, data) => {
-          return err ? reject(err) : resolve9(data);
+          return err ? reject(err) : resolve10(data);
         });
       });
     }
@@ -79246,9 +79246,9 @@ var require_api_upgrade = __commonJS((exports, module) => {
   }
   function upgrade(opts, callback2) {
     if (callback2 === undefined) {
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve10, reject) => {
         upgrade.call(this, opts, (err, data) => {
-          return err ? reject(err) : resolve9(data);
+          return err ? reject(err) : resolve10(data);
         });
       });
     }
@@ -79338,9 +79338,9 @@ var require_api_connect = __commonJS((exports, module) => {
   }
   function connect(opts, callback2) {
     if (callback2 === undefined) {
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve10, reject) => {
         connect.call(this, opts, (err, data) => {
-          return err ? reject(err) : resolve9(data);
+          return err ? reject(err) : resolve10(data);
         });
       });
     }
@@ -79844,7 +79844,7 @@ var require_mock_interceptor = __commonJS((exports, module) => {
 
 // node_modules/webdriver/node_modules/undici/lib/mock/mock-client.js
 var require_mock_client = __commonJS((exports, module) => {
-  var { promisify: promisify3 } = __require("node:util");
+  var { promisify: promisify2 } = __require("node:util");
   var Client = require_client();
   var { buildMockDispatch } = require_mock_utils();
   var {
@@ -79882,7 +79882,7 @@ var require_mock_client = __commonJS((exports, module) => {
       return new MockInterceptor(opts, this[kDispatches]);
     }
     async[kClose]() {
-      await promisify3(this[kOriginalClose])();
+      await promisify2(this[kOriginalClose])();
       this[kConnected] = 0;
       this[kMockAgent][Symbols.kClients].delete(this[kOrigin]);
     }
@@ -79892,7 +79892,7 @@ var require_mock_client = __commonJS((exports, module) => {
 
 // node_modules/webdriver/node_modules/undici/lib/mock/mock-pool.js
 var require_mock_pool = __commonJS((exports, module) => {
-  var { promisify: promisify3 } = __require("node:util");
+  var { promisify: promisify2 } = __require("node:util");
   var Pool = require_pool();
   var { buildMockDispatch } = require_mock_utils();
   var {
@@ -79930,7 +79930,7 @@ var require_mock_pool = __commonJS((exports, module) => {
       return new MockInterceptor(opts, this[kDispatches]);
     }
     async[kClose]() {
-      await promisify3(this[kOriginalClose])();
+      await promisify2(this[kOriginalClose])();
       this[kConnected] = 0;
       this[kMockAgent][Symbols.kClients].delete(this[kOrigin]);
     }
@@ -82842,7 +82842,7 @@ var require_fetch = __commonJS((exports, module) => {
     function dispatch({ body }) {
       const url2 = requestCurrentURL(request);
       const agent = fetchParams.controller.dispatcher;
-      return new Promise((resolve9, reject) => agent.dispatch({
+      return new Promise((resolve10, reject) => agent.dispatch({
         path: url2.pathname + url2.search,
         origin: url2.origin,
         method: request.method,
@@ -82912,7 +82912,7 @@ var require_fetch = __commonJS((exports, module) => {
             }
           }
           const onError = this.onError.bind(this);
-          resolve9({
+          resolve10({
             status,
             statusText,
             headersList,
@@ -82958,7 +82958,7 @@ var require_fetch = __commonJS((exports, module) => {
           for (let i2 = 0;i2 < rawHeaders.length; i2 += 2) {
             headersList.append(bufferToLowerCasedHeaderName(rawHeaders[i2]), rawHeaders[i2 + 1].toString("latin1"), true);
           }
-          resolve9({
+          resolve10({
             status,
             statusText: STATUS_CODES[status],
             headersList,
@@ -86334,8 +86334,8 @@ var require_util16 = __commonJS((exports, module) => {
     return true;
   }
   function delay(ms2) {
-    return new Promise((resolve9) => {
-      setTimeout(resolve9, ms2).unref();
+    return new Promise((resolve10) => {
+      setTimeout(resolve10, ms2).unref();
     });
   }
   module.exports = {
@@ -87716,8 +87716,8 @@ var require_helpers = __commonJS((exports) => {
   function req(url2, opts = {}) {
     const href = typeof url2 === "string" ? url2 : url2.href;
     const req2 = (href.startsWith("https:") ? https : http).request(url2, opts);
-    const promise3 = new Promise((resolve9, reject) => {
-      req2.once("response", resolve9).once("error", reject).end();
+    const promise3 = new Promise((resolve10, reject) => {
+      req2.once("response", resolve10).once("error", reject).end();
     });
     req2.then = promise3.then.bind(promise3);
     return req2;
@@ -87886,7 +87886,7 @@ var require_parse_proxy_response = __commonJS((exports) => {
   var debug_1 = __importDefault(require_src2());
   var debug = (0, debug_1.default)("https-proxy-agent:parse-proxy-response");
   function parseProxyResponse(socket) {
-    return new Promise((resolve9, reject) => {
+    return new Promise((resolve10, reject) => {
       let buffersLength = 0;
       const buffers = [];
       function read() {
@@ -87955,7 +87955,7 @@ var require_parse_proxy_response = __commonJS((exports) => {
         }
         debug("got proxy server response: %o %o", firstLine3, headers);
         cleanup();
-        resolve9({
+        resolve10({
           connect: {
             statusCode,
             statusText,
@@ -88582,20 +88582,20 @@ async function connectWebsocket(candidateUrls, options) {
     }
   }).filter(Boolean);
   const wsConnectPromises = websockets.map((ws2, index) => {
-    const promise3 = new Promise((resolve9) => {
-      ws2.once("open", () => resolve9({ ws: ws2, isConnected: true, index }));
+    const promise3 = new Promise((resolve10) => {
+      ws2.once("open", () => resolve10({ ws: ws2, isConnected: true, index }));
       ws2.once("error", (err) => {
         log6.debug(`Could not connect to Bidi protocol at ${candidateUrls[index]}: ${err.message}`);
-        resolve9({ ws: ws2, isConnected: false, errorMessage: err.message, index });
+        resolve10({ ws: ws2, isConnected: false, errorMessage: err.message, index });
       });
     });
     return { promise: promise3, index };
   });
   let timeoutId;
-  const connectionTimeoutPromise = new Promise((resolve9) => {
+  const connectionTimeoutPromise = new Promise((resolve10) => {
     timeoutId = setTimeout(() => {
       log6.error(`Could not connect to Bidi protocol of any candidate url in time: "${candidateUrls.join('", "')}"`);
-      return resolve9(undefined);
+      return resolve10(undefined);
     }, CONNECTION_TIMEOUT);
   });
   const wsInfo = await Promise.race([
@@ -88667,8 +88667,8 @@ var import_https_proxy_agent, isNode, environment, CommandRuntimeOptions = class
     this.#webSocketUrl = webSocketUrl;
     this.#clientOptions = opts;
     this.#resolveWaitForConnected = () => {};
-    this.#waitForConnected = new Promise((resolve9) => {
-      this.#resolveWaitForConnected = resolve9;
+    this.#waitForConnected = new Promise((resolve10) => {
+      this.#resolveWaitForConnected = resolve10;
     });
   }
   attachClient(client) {
@@ -88731,13 +88731,13 @@ var import_https_proxy_agent, isNode, environment, CommandRuntimeOptions = class
       }
       log5.info("BIDI RESULT", resultLog);
       this.client?.emit("bidiResult", payload);
-      const resolve9 = this.#pendingCommands.get(payload.id);
-      if (!resolve9) {
+      const resolve10 = this.#pendingCommands.get(payload.id);
+      if (!resolve10) {
         log5.error(`Couldn't resolve command with id ${payload.id}`);
         return;
       }
       this.#pendingCommands.delete(payload.id);
-      resolve9(payload);
+      resolve10(payload);
     } catch (err) {
       const error51 = err instanceof Error ? err : new Error(`Failed parse message: ${String(err)}`);
       log5.error(`Failed parse message: ${error51.message}`);
@@ -88746,14 +88746,14 @@ var import_https_proxy_agent, isNode, environment, CommandRuntimeOptions = class
   async send(params) {
     const id = this.sendAsync(params);
     const failError = new Error(`WebDriver Bidi command "${params.method}" failed`);
-    const payload = await new Promise((resolve9, reject) => {
+    const payload = await new Promise((resolve10, reject) => {
       const t2 = setTimeout(() => {
         reject(new Error(`Command ${params.method} with id ${id} (with the following parameter: ${JSON.stringify(params.params)}) timed out`));
         this.#pendingCommands.delete(id);
       }, RESPONSE_TIMEOUT);
       this.#pendingCommands.set(id, (payload2) => {
         clearTimeout(t2);
-        resolve9(payload2);
+        resolve10(payload2);
       });
     });
     if (payload.type === "error" || "error" in payload) {
@@ -91273,8 +91273,8 @@ var init_build6 = __esm(() => {
         };
       }
       this._replServer = repl.start(this._config);
-      return new Promise((resolve9) => {
-        return this._replServer.on("exit", resolve9);
+      return new Promise((resolve10) => {
+        return this._replServer.on("exit", resolve10);
       });
     }
   };
@@ -124103,9 +124103,9 @@ var require_dispatcher_base2 = __commonJS((exports, module) => {
     }
     close(callback2) {
       if (callback2 === undefined) {
-        return new Promise((resolve9, reject) => {
+        return new Promise((resolve10, reject) => {
           this.close((err, data2) => {
-            return err ? reject(err) : resolve9(data2);
+            return err ? reject(err) : resolve10(data2);
           });
         });
       }
@@ -124143,9 +124143,9 @@ var require_dispatcher_base2 = __commonJS((exports, module) => {
         err = null;
       }
       if (callback2 === undefined) {
-        return new Promise((resolve9, reject) => {
+        return new Promise((resolve10, reject) => {
           this.destroy(err, (err2, data2) => {
-            return err2 ? reject(err2) : resolve9(data2);
+            return err2 ? reject(err2) : resolve10(data2);
           });
         });
       }
@@ -127269,8 +127269,8 @@ var require_promise = __commonJS((exports, module) => {
   function createDeferredPromise() {
     let res;
     let rej;
-    const promise3 = new Promise((resolve9, reject) => {
-      res = resolve9;
+    const promise3 = new Promise((resolve10, reject) => {
+      res = resolve10;
       rej = reject;
     });
     return { promise: promise3, resolve: res, reject: rej };
@@ -128460,12 +128460,12 @@ upgrade: ${upgrade}\r
         cb();
       }
     }
-    const waitForDrain = () => new Promise((resolve9, reject) => {
+    const waitForDrain = () => new Promise((resolve10, reject) => {
       assert2(callback2 === null);
       if (socket[kError]) {
         reject(socket[kError]);
       } else {
-        callback2 = resolve9;
+        callback2 = resolve10;
       }
     });
     socket.on("close", onDrain).on("drain", onDrain);
@@ -129216,12 +129216,12 @@ var require_client_h22 = __commonJS((exports, module) => {
         cb();
       }
     }
-    const waitForDrain = () => new Promise((resolve9, reject) => {
+    const waitForDrain = () => new Promise((resolve10, reject) => {
       assert2(callback2 === null);
       if (socket[kError]) {
         reject(socket[kError]);
       } else {
-        callback2 = resolve9;
+        callback2 = resolve10;
       }
     });
     h2stream.on("close", onDrain).on("drain", onDrain);
@@ -129520,16 +129520,16 @@ var require_client2 = __commonJS((exports, module) => {
       return this[kNeedDrain] < 2;
     }
     [kClose]() {
-      return new Promise((resolve9) => {
+      return new Promise((resolve10) => {
         if (this[kSize]) {
-          this[kClosedResolve] = resolve9;
+          this[kClosedResolve] = resolve10;
         } else {
-          resolve9(null);
+          resolve10(null);
         }
       });
     }
     [kDestroy](err) {
-      return new Promise((resolve9) => {
+      return new Promise((resolve10) => {
         const requests = this[kQueue].splice(this[kPendingIdx]);
         for (let i2 = 0;i2 < requests.length; i2++) {
           const request = requests[i2];
@@ -129540,7 +129540,7 @@ var require_client2 = __commonJS((exports, module) => {
             this[kClosedResolve]();
             this[kClosedResolve] = null;
           }
-          resolve9(null);
+          resolve10(null);
         };
         if (this[kHTTPContext]) {
           this[kHTTPContext].destroy(err, callback2);
@@ -129927,8 +129927,8 @@ var require_pool_base2 = __commonJS((exports, module) => {
         }
         return Promise.all(closeAll);
       } else {
-        return new Promise((resolve9) => {
-          this[kClosedResolve] = resolve9;
+        return new Promise((resolve10) => {
+          this[kClosedResolve] = resolve10;
         });
       }
     }
@@ -130961,10 +130961,10 @@ var require_socks5_proxy_agent = __commonJS((exports, module) => {
       const proxyHost = this[kProxyUrl].hostname;
       const proxyPort = parseInt(this[kProxyUrl].port) || 1080;
       debug("creating SOCKS5 connection to", proxyHost, proxyPort);
-      const socket = await new Promise((resolve9, reject) => {
+      const socket = await new Promise((resolve10, reject) => {
         const onConnect = () => {
           socket2.removeListener("error", onError);
-          resolve9(socket2);
+          resolve10(socket2);
         };
         const onError = (err) => {
           socket2.removeListener("connect", onConnect);
@@ -130983,14 +130983,14 @@ var require_socks5_proxy_agent = __commonJS((exports, module) => {
         socket.destroy();
       });
       await socks5Client.handshake();
-      await new Promise((resolve9, reject) => {
+      await new Promise((resolve10, reject) => {
         const timeout = setTimeout(() => {
           reject(new Error("SOCKS5 authentication timeout"));
         }, 5000);
         const onAuthenticated = () => {
           clearTimeout(timeout);
           socks5Client.removeListener("error", onError);
-          resolve9();
+          resolve10();
         };
         const onError = (err) => {
           clearTimeout(timeout);
@@ -130999,14 +130999,14 @@ var require_socks5_proxy_agent = __commonJS((exports, module) => {
         };
         if (socks5Client.state === "authenticated") {
           clearTimeout(timeout);
-          resolve9();
+          resolve10();
         } else {
           socks5Client.once("authenticated", onAuthenticated);
           socks5Client.once("error", onError);
         }
       });
       await socks5Client.connect(targetHost, targetPort);
-      await new Promise((resolve9, reject) => {
+      await new Promise((resolve10, reject) => {
         const timeout = setTimeout(() => {
           reject(new Error("SOCKS5 connection timeout"));
         }, 5000);
@@ -131014,7 +131014,7 @@ var require_socks5_proxy_agent = __commonJS((exports, module) => {
           debug("SOCKS5 tunnel established to", targetHost, targetPort, "via", info);
           clearTimeout(timeout);
           socks5Client.removeListener("error", onError);
-          resolve9();
+          resolve10();
         };
         const onError = (err) => {
           clearTimeout(timeout);
@@ -131052,8 +131052,8 @@ var require_socks5_proxy_agent = __commonJS((exports, module) => {
                     servername: targetHost,
                     ...connectOpts.tls || {}
                   });
-                  await new Promise((resolve9, reject) => {
-                    finalSocket.once("secureConnect", resolve9);
+                  await new Promise((resolve10, reject) => {
+                    finalSocket.once("secureConnect", resolve10);
                     finalSocket.once("error", reject);
                   });
                 }
@@ -131929,7 +131929,7 @@ var require_readable8 = __commonJS((exports, module) => {
       if (this._readableState.closeEmitted) {
         return Promise.resolve(null);
       }
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve10, reject) => {
         if (this[kContentLength] && this[kContentLength] > limit || this[kBytesRead] > limit) {
           this.destroy(new AbortError);
         }
@@ -131943,11 +131943,11 @@ var require_readable8 = __commonJS((exports, module) => {
             if (signal.aborted) {
               reject(signal.reason ?? new AbortError);
             } else {
-              resolve9(null);
+              resolve10(null);
             }
           });
         } else {
-          this.on("close", resolve9);
+          this.on("close", resolve10);
         }
         this.on("error", noop).on("data", () => {
           if (this[kBytesRead] > limit) {
@@ -131971,7 +131971,7 @@ var require_readable8 = __commonJS((exports, module) => {
   }
   function consume(stream, type) {
     assert2(!stream[kConsume]);
-    return new Promise((resolve9, reject) => {
+    return new Promise((resolve10, reject) => {
       if (isUnusable(stream)) {
         const rState = stream._readableState;
         if (rState.destroyed && rState.closeEmitted === false) {
@@ -131986,7 +131986,7 @@ var require_readable8 = __commonJS((exports, module) => {
           stream[kConsume] = {
             type,
             stream,
-            resolve: resolve9,
+            resolve: resolve10,
             reject,
             length: 0,
             body: []
@@ -132059,18 +132059,18 @@ var require_readable8 = __commonJS((exports, module) => {
     return buffer;
   }
   function consumeEnd(consume2, encoding) {
-    const { type, body, resolve: resolve9, stream, length } = consume2;
+    const { type, body, resolve: resolve10, stream, length } = consume2;
     try {
       if (type === "text") {
-        resolve9(chunksDecode(body, length, encoding));
+        resolve10(chunksDecode(body, length, encoding));
       } else if (type === "json") {
-        resolve9(JSON.parse(chunksDecode(body, length, encoding)));
+        resolve10(JSON.parse(chunksDecode(body, length, encoding)));
       } else if (type === "arrayBuffer") {
-        resolve9(chunksConcat(body, length).buffer);
+        resolve10(chunksConcat(body, length).buffer);
       } else if (type === "blob") {
-        resolve9(new Blob(body, { type: stream[kContentType] }));
+        resolve10(new Blob(body, { type: stream[kContentType] }));
       } else if (type === "bytes") {
-        resolve9(chunksConcat(body, length));
+        resolve10(chunksConcat(body, length));
       }
       consumeFinish(consume2);
     } catch (err) {
@@ -132257,9 +132257,9 @@ var require_api_request2 = __commonJS((exports, module) => {
   }
   function request(opts, callback2) {
     if (callback2 === undefined) {
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve10, reject) => {
         request.call(this, opts, (err, data2) => {
-          return err ? reject(err) : resolve9(data2);
+          return err ? reject(err) : resolve10(data2);
         });
       });
     }
@@ -132465,9 +132465,9 @@ var require_api_stream2 = __commonJS((exports, module) => {
   }
   function stream(opts, factory, callback2) {
     if (callback2 === undefined) {
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve10, reject) => {
         stream.call(this, opts, factory, (err, data2) => {
-          return err ? reject(err) : resolve9(data2);
+          return err ? reject(err) : resolve10(data2);
         });
       });
     }
@@ -132752,9 +132752,9 @@ var require_api_upgrade2 = __commonJS((exports, module) => {
   }
   function upgrade(opts, callback2) {
     if (callback2 === undefined) {
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve10, reject) => {
         upgrade.call(this, opts, (err, data2) => {
-          return err ? reject(err) : resolve9(data2);
+          return err ? reject(err) : resolve10(data2);
         });
       });
     }
@@ -132845,9 +132845,9 @@ var require_api_connect2 = __commonJS((exports, module) => {
   }
   function connect(opts, callback2) {
     if (callback2 === undefined) {
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve10, reject) => {
         connect.call(this, opts, (err, data2) => {
-          return err ? reject(err) : resolve9(data2);
+          return err ? reject(err) : resolve10(data2);
         });
       });
     }
@@ -133445,7 +133445,7 @@ var require_mock_interceptor2 = __commonJS((exports, module) => {
 
 // node_modules/undici/lib/mock/mock-client.js
 var require_mock_client2 = __commonJS((exports, module) => {
-  var { promisify: promisify3 } = __require("node:util");
+  var { promisify: promisify2 } = __require("node:util");
   var Client2 = require_client2();
   var { buildMockDispatch } = require_mock_utils2();
   var {
@@ -133488,7 +133488,7 @@ var require_mock_client2 = __commonJS((exports, module) => {
       this[kDispatches] = [];
     }
     async[kClose]() {
-      await promisify3(this[kOriginalClose])();
+      await promisify2(this[kOriginalClose])();
       this[kConnected] = 0;
       this[kMockAgent][Symbols.kClients].delete(this[kOrigin]);
     }
@@ -133695,7 +133695,7 @@ var require_mock_call_history = __commonJS((exports, module) => {
 
 // node_modules/undici/lib/mock/mock-pool.js
 var require_mock_pool2 = __commonJS((exports, module) => {
-  var { promisify: promisify3 } = __require("node:util");
+  var { promisify: promisify2 } = __require("node:util");
   var Pool2 = require_pool2();
   var { buildMockDispatch } = require_mock_utils2();
   var {
@@ -133738,7 +133738,7 @@ var require_mock_pool2 = __commonJS((exports, module) => {
       this[kDispatches] = [];
     }
     async[kClose]() {
-      await promisify3(this[kOriginalClose])();
+      await promisify2(this[kOriginalClose])();
       this[kConnected] = 0;
       this[kMockAgent][Symbols.kClients].delete(this[kOrigin]);
     }
@@ -134044,7 +134044,7 @@ var require_snapshot_utils = __commonJS((exports, module) => {
 // node_modules/undici/lib/mock/snapshot-recorder.js
 var require_snapshot_recorder = __commonJS((exports, module) => {
   var { writeFile, readFile, mkdir } = __require("node:fs/promises");
-  var { dirname: dirname11, resolve: resolve9 } = __require("node:path");
+  var { dirname: dirname11, resolve: resolve10 } = __require("node:path");
   var { setTimeout: setTimeout3, clearTimeout: clearTimeout2 } = __require("node:timers");
   var { InvalidArgumentError: InvalidArgumentError3, UndiciError } = require_errors6();
   var { hashId, isUrlExcludedFactory, normalizeHeaders, createHeaderFilters } = require_snapshot_utils();
@@ -134215,7 +134215,7 @@ var require_snapshot_recorder = __commonJS((exports, module) => {
         throw new InvalidArgumentError3("Snapshot path is required");
       }
       try {
-        const data2 = await readFile(resolve9(path4), "utf8");
+        const data2 = await readFile(resolve10(path4), "utf8");
         const parsed = JSON.parse(data2);
         if (Array.isArray(parsed)) {
           this.#snapshots.clear();
@@ -134238,7 +134238,7 @@ var require_snapshot_recorder = __commonJS((exports, module) => {
       if (!path4) {
         throw new InvalidArgumentError3("Snapshot path is required");
       }
-      const resolvedPath = resolve9(path4);
+      const resolvedPath = resolve10(path4);
       await mkdir(dirname11(resolvedPath), { recursive: true });
       const data2 = Array.from(this.#snapshots.entries()).map(([hash2, snapshot]) => ({
         hash: hash2,
@@ -140186,7 +140186,7 @@ var require_fetch2 = __commonJS((exports, module) => {
       const agent = fetchParams.controller.dispatcher;
       const path4 = url2.pathname + url2.search;
       const hasTrailingQuestionMark = url2.search.length === 0 && url2.href[url2.href.length - url2.hash.length - 1] === "?";
-      return new Promise((resolve9, reject) => agent.dispatch({
+      return new Promise((resolve10, reject) => agent.dispatch({
         path: hasTrailingQuestionMark ? `${path4}?` : path4,
         origin: url2.origin,
         method: request.method,
@@ -140268,7 +140268,7 @@ var require_fetch2 = __commonJS((exports, module) => {
             }
           }
           const onError = this.onError.bind(this);
-          resolve9({
+          resolve10({
             status,
             statusText,
             headersList,
@@ -140321,7 +140321,7 @@ var require_fetch2 = __commonJS((exports, module) => {
               headersList.append(headerName, String(value), true);
             }
           }
-          resolve9({
+          resolve10({
             status,
             statusText: STATUS_CODES[status],
             headersList,
@@ -140345,7 +140345,7 @@ var require_fetch2 = __commonJS((exports, module) => {
               headersList.append(nameStr, value.toString("latin1"), true);
             }
           }
-          resolve9({
+          resolve10({
             status,
             statusText: STATUS_CODES[status],
             headersList,
@@ -144354,7 +144354,7 @@ async function fromURL(url2, options = {}) {
     path: urlObject.pathname + urlObject.search,
     ...requestOptions
   };
-  const promise3 = new Promise((resolve9, reject) => {
+  const promise3 = new Promise((resolve10, reject) => {
     undiciStream = new $Client(urlObject.origin).compose($interceptors2.redirect({ maxRedirections: 5 })).stream(streamOptions, (res) => {
       var _a6, _b;
       if (res.statusCode < 200 || res.statusCode >= 300) {
@@ -144376,7 +144376,7 @@ async function fromURL(url2, options = {}) {
         baseURI,
         ...cheerioOptions
       };
-      return decodeStream(opts, (err, $3) => err ? reject(err) : resolve9($3));
+      return decodeStream(opts, (err, $3) => err ? reject(err) : resolve10($3));
     });
   });
   await undiciStream;
@@ -144506,8 +144506,8 @@ async function uploadFile(localPath) {
   }
   const zipData = [];
   const source = fs52.createReadStream(localPath);
-  return new Promise((resolve9, reject) => {
-    import_archiver.default("zip").on("error", (err) => reject(err)).on("data", (data2) => zipData.push(data2)).on("end", () => this.file(Buffer.concat(zipData).toString("base64")).then((localPath2) => resolve9(localPath2), reject)).append(source, { name: path5.basename(localPath) }).finalize();
+  return new Promise((resolve10, reject) => {
+    import_archiver.default("zip").on("error", (err) => reject(err)).on("data", (data2) => zipData.push(data2)).on("end", () => this.file(Buffer.concat(zipData).toString("base64")).then((localPath2) => resolve10(localPath2), reject)).append(source, { name: path5.basename(localPath) }).finalize();
   });
 }
 function isUnknownMethodError(err) {
@@ -144620,19 +144620,19 @@ async function takeScreenshotBidi(filepath, options) {
     type: imageFormat,
     quality
   };
-  const clip = options?.clip ? {
+  const clip2 = options?.clip ? {
     type: "box",
     x: options.clip.x,
     y: options.clip.y,
     width: options.clip.width,
     height: options.clip.height
   } : undefined;
-  if (clip) {
-    if (typeof clip.x !== "number" || typeof clip.y !== "number" || typeof clip.width !== "number" || typeof clip.height !== "number") {
+  if (clip2) {
+    if (typeof clip2.x !== "number" || typeof clip2.y !== "number" || typeof clip2.width !== "number" || typeof clip2.height !== "number") {
       throw new Error("Invalid clip, use an object with x, y, width and height properties");
     }
   }
-  const { data: data2 } = contextManager.findParentContext(context, tree.contexts) ? await browser.$("html").getElement().then((el) => this.takeElementScreenshot(el.elementId).then((data22) => ({ data: data22 }))) : await this.browsingContextCaptureScreenshot({ context, origin, format, clip });
+  const { data: data2 } = contextManager.findParentContext(context, tree.contexts) ? await browser.$("html").getElement().then((el) => this.takeElementScreenshot(el.elementId).then((data22) => ({ data: data22 }))) : await this.browsingContextCaptureScreenshot({ context, origin, format, clip: clip2 });
   return data2;
 }
 async function saveElementScreenshot(filepath) {
@@ -145021,7 +145021,7 @@ function debug(commandTimeout = 5000) {
       });
     }
   });
-  return new Promise((resolve9) => commandResolve = resolve9);
+  return new Promise((resolve10) => commandResolve = resolve10);
 }
 async function deleteCookies(filter5) {
   const filterArray2 = typeof filter5 === "undefined" ? undefined : Array.isArray(filter5) ? filter5 : [filter5];
@@ -145599,7 +145599,7 @@ async function newWindow2(url2, { type = "window", windowName = "", windowFeatur
   return { handle: newTab, type };
 }
 function pause(milliseconds = 1000) {
-  return new Promise((resolve9) => setTimeout(resolve9, milliseconds));
+  return new Promise((resolve10) => setTimeout(resolve10, milliseconds));
 }
 async function react$$3(selector, { props = {}, state: state2 = {} } = {}) {
   await this.executeScript(resqScript, []);
@@ -146528,7 +146528,7 @@ async function getCurrentContexts({
       }
       return parsedContexts;
     }
-    await new Promise((resolve9) => setTimeout(resolve9, retryInterval));
+    await new Promise((resolve10) => setTimeout(resolve10, retryInterval));
   }
   throw new Error(`The packageName '${packageName}' ${isPackageNameMissing ? "could not be found!" : "matches, but no webview with pages was loaded in this response: " + JSON.stringify(contexts) + "'"}`);
 }
@@ -151128,8 +151128,8 @@ window.__wdio_sinon = withGlobal(globalThis);
     this._fn = _fn;
     this._leading = _leading;
     this._signal = _signal;
-    this.#retPromise = new Promise((resolve9, reject) => {
-      this._resolve = resolve9;
+    this.#retPromise = new Promise((resolve10, reject) => {
+      this._resolve = resolve10;
       this._reject = reject;
     });
     this._start();
@@ -155130,6 +155130,9 @@ function errorCode(err) {
 function isNoEntError(err) {
   return errorCode(err) === "ENOENT";
 }
+function isTimeoutError(err) {
+  return err instanceof Error && err.name === "TimeoutError";
+}
 var missingPackagePattern = /Cannot find (?:package|module) '([^']+)'/;
 var pathLikeSpecifierPattern = /^(?:\.|\/|[A-Za-z]:[\\/])/;
 function extractMissingPackage(text) {
@@ -155140,6 +155143,11 @@ function extractMissingPackage(text) {
   return specifier;
 }
 
+// src/core/formatSeconds.ts
+function formatSeconds(ms) {
+  return `${Math.round(ms / 1000)}s`;
+}
+
 // src/core/messages/auth.ts
 var authMessages = {
   title: "QA Wolf Authentication",
@@ -155174,7 +155182,8 @@ var authMessages = {
       invalidOrUnauthorized: "API key is invalid or unauthorized",
       unexpectedFormat: "Could not verify API key: unexpected response format",
       couldNotVerify: (detail, status) => `Could not verify API key: ${detail || `HTTP ${status}`}`,
-      couldNotVerifyNetwork: (cause) => `Could not verify API key: ${cause}`
+      couldNotVerifyNetwork: (cause) => `Could not verify API key: ${cause}`,
+      timedOut: (timeoutMs) => `Could not verify API key: the QA Wolf API did not answer within ${formatSeconds(timeoutMs)}.`
     },
     request: {
       rejected401: (noun) => `QA Wolf API rejected the${noun ? ` ${noun}` : ""} request (HTTP 401). Check your API key.`,
@@ -155182,12 +155191,14 @@ var authMessages = {
       notFound404: (noun) => `QA Wolf API could not find ${noun ? `${noun} for that environment` : "that environment"} (HTTP 404). Check the --env value.`,
       failedWithStatus: (status, noun) => `QA Wolf API${noun ? ` ${noun}` : ""} request failed (HTTP ${status}).`,
       networkUnreachable: (baseUrl, noun) => `Could not reach the QA Wolf API at ${baseUrl}${noun ? ` to fetch ${noun}` : ""}. Check your network connection and QAWOLF_HOST_URL.`,
+      timedOut: (timeoutMs, noun) => `The QA Wolf API${noun ? ` ${noun}` : ""} request timed out after ${formatSeconds(timeoutMs)}. The work may still be finishing on the platform.`,
       unexpectedResponse: (noun) => `Unexpected${noun ? ` ${noun}` : ""} response from the QA Wolf API.`
     },
     bundle: {
       linkExpired: "The flow bundle download link has expired. Please run `qawolf flows pull` again to refresh.",
       failedWithStatus: (status) => `Could not download the flow bundle (HTTP ${status}).`,
       networkUnreachable: "Could not reach the flow bundle storage. Check your network connection and try again.",
+      timedOut: (timeoutMs) => `Downloading the flow bundle timed out after ${formatSeconds(timeoutMs)}. Please try again.`,
       malformed: "The flow bundle download was malformed. Please run `qawolf flows pull` again."
     }
   },
@@ -155205,6 +155216,21 @@ var authMessages = {
 `)
   }
 };
+// src/core/messages/toolNotFound.ts
+var installRemedy = "Run `qawolf install` to install the runtime dependencies.";
+function toolNotInstalled(tool, path) {
+  const located = path === undefined ? `${tool} is not installed.` : `${tool} not found at ${path}.`;
+  return `${located}
+${installRemedy}`;
+}
+function toolNotRunnable(what, detail) {
+  return `${what} (${detail}).
+${installRemedy}`;
+}
+function packageLoadFailed(pkg, envDir, detail) {
+  return toolNotRunnable(`Could not load ${pkg} from ${envDir}`, detail);
+}
+
 // src/core/messages/doctor.ts
 var doctorMessages = {
   intro: "qawolf doctor",
@@ -155242,14 +155268,13 @@ var doctorMessages = {
     notInstalled: "npm is not installed or not on PATH"
   },
   playwright: {
-    notFound: "Could not find Playwright. Run `qawolf flows run` to install it, or run `npm install playwright` in your flow directory.",
+    notFound: (path) => toolNotInstalled("Playwright", path),
     launchFailed: "Could not launch Playwright. Try reinstalling the qawolf CLI.",
     versionUnparseable: "Could not parse playwright version output"
   },
   appium: {
-    noEnvDir: "No env dir found. Run `qawolf flows run` to install Appium dependencies.",
-    binaryMissing: (bin) => `Appium binary missing at ${bin}. Run \`qawolf flows run\` to install.`,
-    driverListFailed: (detail) => `Could not run \`appium driver list\` (${detail}). The Appium binary may be broken — try \`qawolf flows run\` to reinstall.`,
+    notFound: (path) => toolNotInstalled("Appium", path),
+    driverListFailed: (detail) => toolNotRunnable("Could not run `appium driver list`", detail),
     cannotCheckDriverList: "Cannot check driver list without Appium binary.",
     uiautomator2NotInstalled: "uiautomator2 driver not installed. Run `qawolf install android` to install it."
   },
@@ -155355,6 +155380,7 @@ var installMessages = {
 ` + "Install Android Studio and open Tools > SDK Manager to install the SDK.",
   installingBrowser: (browser) => `Install ${browser}`,
   browsersInstalled: (count) => `Installed ${pluralize(count, "browser")}.`,
+  playwrightNotFound: (playwrightPath) => toolNotInstalled("Playwright", playwrightPath),
   playwrightInstallFailed: (browser, detail) => `playwright install ${browser} failed: ${detail}`,
   playwrightInstallLaunchFailed: (browser) => `playwright install ${browser} failed: process failed to launch`,
   clear: {
@@ -155381,11 +155407,13 @@ var installMessages = {
     avdAlreadyExists: (avdName) => `AVD ${avdName} already exists, skipping.`,
     creatingAvd: (avdName) => `Creating AVD ${avdName}`,
     avdmanagerCreateFailed: (avdName, detail) => `avdmanager failed to create ${avdName}: ${detail}`,
-    uiautomator2InstallFailed: (detail) => `appium driver install uiautomator2 failed: ${detail}`
+    uiautomator2InstallFailed: (detail) => `appium driver install uiautomator2 failed: ${detail}`,
+    appiumNotFound: (appiumPath) => toolNotInstalled("Appium", appiumPath)
   }
 };
 // src/core/messages/runner.ts
 var runnerMessages = {
+  playwrightLoadFailed: (envDir, detail) => packageLoadFailed("Playwright", envDir, detail),
   androidWorkersUnsupported: "Android flows are not yet supported with --workers > 1; rerun Android flows with --workers 1.",
   noFlowsMatched: "No flows matched.",
   androidBootFailed: "Android boot failed",
@@ -155406,9 +155434,18 @@ var runnerMessages = {
   managedRuntimeNote: (dir) => `Using managed runtime — override with --deps <dir> or QAWOLF_RUNTIME_DIR:
 ${dir}`,
   installingProjectDeps: (count) => `Installing ${pluralize(count, "project dependency", "project dependencies")}…`,
+  depsDirIncomplete: (dir, failures) => [
+    `--deps directory ${dir} is missing required pinned dependencies:`,
+    ...failures.map((failure) => `  - ${failure}`),
+    `Run 'npm install' in that directory or point to a valid managed env directory.`
+  ].join(`
+`),
   outerHopCandidateRejected: (dir, missing) => `outer-hop candidate rejected: ${dir} missing ${missing.join(", ")}`,
   moduleNotFoundHint: (pkg, projectDir) => projectDir === undefined ? `Hint: '${pkg}' could not be resolved. Run from within your flows project so its dependencies can be found.` : `Hint: '${pkg}' could not be resolved. Ensure it is declared in ${projectDir}/package.json "dependencies" and run npm install in that project.`
 };
+// src/core/paths.ts
+import { join } from "node:path";
+
 // node_modules/env-paths/index.js
 import path from "node:path";
 import os from "node:os";
@@ -155509,6 +155546,9 @@ function getDataDir() {
   _paths ??= envPaths("qawolf");
   return _paths.data;
 }
+function getAppiumHome() {
+  return join(getDataDir(), "appium");
+}
 
 // src/shell/exit.ts
 var exitCodes = {
@@ -155639,7 +155679,7 @@ function resolveHostUrl(env2) {
 import { Entry as Entry3 } from "@napi-rs/keyring";
 
 // src/domains/auth/store/delete.ts
-import { join } from "node:path";
+import { join as join2 } from "node:path";
 import { Entry } from "@napi-rs/keyring";
 
 // src/domains/auth/store/constants.ts
@@ -155658,7 +155698,7 @@ function deleteFromKeychain() {
 }
 async function deleteFromFile(configDir, fs2) {
   try {
-    await fs2.unlink(join(configDir, credentialsFile));
+    await fs2.unlink(join2(configDir, credentialsFile));
     return "deleted";
   } catch {
     return "not-found";
@@ -155672,7 +155712,7 @@ async function deleteApiKey(configDir, fs2) {
   return { keychain, file };
 }
 // src/domains/auth/store/load.ts
-import { join as join2 } from "node:path";
+import { join as join3 } from "node:path";
 
 // node_modules/zod/v4/classic/external.js
 var exports_external = {};
@@ -169967,7 +170007,7 @@ async function loadApiKey(configDir, deps) {
     errors3.keychain = errorMessage(err);
   }
   try {
-    const content = await deps.fs.readFile(join2(configDir, credentialsFile));
+    const content = await deps.fs.readFile(join3(configDir, credentialsFile));
     const parsed = credentialsFileSchema.safeParse(JSON.parse(content));
     if (parsed.success) {
       return { found: true, key: parsed.data.apiKey, source: "file" };
@@ -169979,12 +170019,12 @@ async function loadApiKey(configDir, deps) {
   return { found: false, errors: errors3 };
 }
 // src/domains/auth/store/save.ts
-import { join as join3 } from "node:path";
+import { join as join4 } from "node:path";
 import { Entry as Entry2 } from "@napi-rs/keyring";
 async function saveToFile(configDir, key, fs2) {
   const payload = { apiKey: key };
   await fs2.mkdir(configDir, { recursive: true, mode: 448 });
-  await fs2.writeFile(join3(configDir, credentialsFile), JSON.stringify(payload, undefined, 2), { mode: 384 });
+  await fs2.writeFile(join4(configDir, credentialsFile), JSON.stringify(payload, undefined, 2), { mode: 384 });
 }
 async function saveApiKey(configDir, key, fs2) {
   try {
@@ -170024,7 +170064,7 @@ async function requireApiKey(configDir, fs2, deps) {
 }
 // src/domains/auth/validate.ts
 async function validateApiKey(deps) {
-  const result = await deps.platform.getIdentity();
+  const result = await deps.platformClient.getIdentity();
   if (!result.ok) {
     return { valid: false, error: result.error };
   }
@@ -170036,9 +170076,9 @@ async function validateApiKey(deps) {
 // src/shell/logger.ts
 var import_pino = __toESM(require_pino(), 1);
 import { mkdirSync as mkdirSync2, openSync } from "node:fs";
-import { dirname, join as join4 } from "node:path";
+import { dirname, join as join5 } from "node:path";
 function defaultLogPath() {
-  return join4(envPaths("qawolf", { suffix: "" }).log, "cli.log");
+  return join5(envPaths("qawolf", { suffix: "" }).log, "cli.log");
 }
 function resolveStderrLevel(env2, verbose) {
   if (verbose)
@@ -170118,6 +170158,8 @@ function describeIdentityError(err) {
   if (err.kind === "network") {
     return m.identity.couldNotVerifyNetwork(err.cause.message);
   }
+  if (err.kind === "timeout")
+    return m.identity.timedOut(err.timeoutMs);
   return m.identity.unexpectedFormat;
 }
 function parseErrorBody(body) {
@@ -170144,6 +170186,8 @@ function describeRequestError(err, baseUrl, noun) {
   if (err.kind === "network") {
     return m.request.networkUnreachable(baseUrl, noun);
   }
+  if (err.kind === "timeout")
+    return m.request.timedOut(err.timeoutMs, noun);
   return m.request.unexpectedResponse(noun);
 }
 function describeBundleDownloadError(err) {
@@ -170154,6 +170198,8 @@ function describeBundleDownloadError(err) {
   }
   if (err.kind === "network")
     return m.bundle.networkUnreachable;
+  if (err.kind === "timeout")
+    return m.bundle.timedOut(err.timeoutMs);
   return m.bundle.malformed;
 }
 function describeTeamStorageDownloadError(path2, err) {
@@ -170166,6 +170212,9 @@ function describeTeamStorageDownloadError(path2, err) {
   if (err.kind === "network") {
     return `Could not reach team-storage while downloading ${path2}. Check your network connection and try again.`;
   }
+  if (err.kind === "timeout") {
+    return `Downloading the team-storage asset ${path2} timed out after ${formatSeconds(err.timeoutMs)}. Please try again.`;
+  }
   return `The team-storage download for ${path2} was malformed. Please run \`qawolf flows pull\` again.`;
 }
 
@@ -170181,7 +170230,7 @@ async function requestWithRetry(args) {
     if (result.ok)
       return { ok: true, value: result.data };
     const backoff = args.backoffMs[attempt];
-    const retryable = result.error.kind === "network";
+    const retryable = result.error.kind === "network" || result.error.kind === "timeout";
     if (backoff === undefined || !retryable) {
       return { ok: false, error: args.describe(result.error) };
     }
@@ -170190,16 +170239,16 @@ async function requestWithRetry(args) {
 }
 
 // src/shell/platform/callPublicApi.ts
-function callPublicApi(trpc, contract, input) {
+function callPublicApi(trpc, contract, input, options) {
   const path2 = `public.${contract.name}`;
   if (contract.kind === "read") {
-    return trpc.query(path2, input, contract.output);
+    return trpc.query(path2, input, contract.output, options);
   }
-  return trpc.mutation(path2, input, contract.output);
+  return trpc.mutation(path2, input, contract.output, options);
 }
 function makeCallPublicApiMethod(trpc, deps, readBackoffMs) {
-  return async (contract, input) => requestWithRetry({
-    call: () => callPublicApi(trpc, contract, input),
+  return async (contract, input, options) => requestWithRetry({
+    call: () => callPublicApi(trpc, contract, input, options),
     backoffMs: contract.kind === "read" ? readBackoffMs : [],
     describe: (err) => describeRequestError(err, deps.baseUrl, contract.name),
     sleep: deps.sleep
@@ -171002,52 +171051,18 @@ function toError(value) {
   return value instanceof Error ? value : new Error(String(value));
 }
 
-// src/shell/platform/createTrpcClient.ts
-var timeoutMs = 15000;
-function createTrpcClient(apiKey, deps) {
-  const authHeader = { Authorization: `Bearer ${apiKey}` };
-  const { logger } = deps;
-  async function withLogging(path2, call) {
-    logger?.debug(`→ ${path2}`);
-    const result = await call();
-    if (result.ok) {
-      logger?.debug(`← ${path2} ok`);
-    } else {
-      const e = result.error;
-      const raw = e.kind === "http" ? e.body : e.cause.message;
-      const clipped = raw.length > 200 ? raw.slice(0, 200) + "…" : raw;
-      const msg = e.kind === "http" ? `${e.status} ${clipped}` : clipped;
-      logger?.warn(`← ${path2} error (${e.kind}): ${msg}`);
-    }
-    return result;
-  }
-  return {
-    query: (path2, input, schema) => {
-      const encoded = encodeURIComponent(JSON.stringify(dist_default.serialize(input)));
-      const url2 = `${deps.baseUrl}/api/trpc/${path2}?input=${encoded}`;
-      return withLogging(path2, () => send(deps.fetch, url2, {
-        headers: authHeader,
-        method: "GET",
-        signal: AbortSignal.timeout(timeoutMs)
-      }, schema));
-    },
-    mutation: (path2, input, schema) => {
-      const url2 = `${deps.baseUrl}/api/trpc/${path2}`;
-      const body = JSON.stringify(dist_default.serialize(input));
-      return withLogging(path2, () => send(deps.fetch, url2, {
-        body,
-        headers: { ...authHeader, "content-type": "application/json" },
-        method: "POST",
-        signal: AbortSignal.timeout(timeoutMs)
-      }, schema));
-    }
-  };
-}
-async function send(fetchFn, url2, init, schema) {
+// src/shell/platform/sendWireRequest.ts
+async function sendWireRequest(fetchFn, url2, init, schema, timeoutMs) {
   let response;
   try {
-    response = await fetchFn(url2, init);
+    response = await fetchFn(url2, {
+      ...init,
+      signal: AbortSignal.timeout(timeoutMs)
+    });
   } catch (error51) {
+    if (isTimeoutError(error51)) {
+      return { ok: false, error: { kind: "timeout", timeoutMs } };
+    }
     return { ok: false, error: { cause: toError(error51), kind: "network" } };
   }
   if (!response.ok) {
@@ -171061,6 +171076,9 @@ async function send(fetchFn, url2, init, schema) {
   try {
     body = await response.json();
   } catch (error51) {
+    if (isTimeoutError(error51)) {
+      return { ok: false, error: { kind: "timeout", timeoutMs } };
+    }
     return { ok: false, error: { cause: toError(error51), kind: "parse" } };
   }
   try {
@@ -171082,23 +171100,71 @@ function unwrap(body) {
     return dist_default.deserialize(data);
   return data;
 }
-var isRecord = (v) => typeof v === "object" && v !== null;
-var isSuperJSONResult = (v) => isRecord(v) && ("json" in v);
+var isRecord = (value) => typeof value === "object" && value !== null;
+var isSuperJSONResult = (value) => isRecord(value) && ("json" in value);
+
+// src/shell/platform/createTrpcClient.ts
+var defaultRequestTimeoutMs = 15000;
+function createTrpcClient(apiKey, deps) {
+  const authHeader = { Authorization: `Bearer ${apiKey}` };
+  const { logger } = deps;
+  const defaultTimeoutMs2 = deps.defaultTimeoutMs ?? defaultRequestTimeoutMs;
+  async function withLogging(path2, call) {
+    logger?.debug(`→ ${path2}`);
+    const result = await call();
+    if (result.ok) {
+      logger?.debug(`← ${path2} ok`);
+    } else {
+      const e = result.error;
+      logger?.warn(`← ${path2} error (${e.kind}): ${summarize(e)}`);
+    }
+    return result;
+  }
+  return {
+    query: (path2, input, schema, options) => {
+      const encoded = encodeURIComponent(JSON.stringify(dist_default.serialize(input)));
+      const url2 = `${deps.baseUrl}/api/trpc/${path2}?input=${encoded}`;
+      return withLogging(path2, () => sendWireRequest(deps.fetch, url2, { headers: authHeader, method: "GET" }, schema, options?.timeoutMs ?? defaultTimeoutMs2));
+    },
+    mutation: (path2, input, schema, options) => {
+      const url2 = `${deps.baseUrl}/api/trpc/${path2}`;
+      const body = JSON.stringify(dist_default.serialize(input));
+      return withLogging(path2, () => sendWireRequest(deps.fetch, url2, {
+        body,
+        headers: { ...authHeader, "content-type": "application/json" },
+        method: "POST"
+      }, schema, options?.timeoutMs ?? defaultTimeoutMs2));
+    }
+  };
+}
+function clip(text) {
+  return text.length > 200 ? text.slice(0, 200) + "…" : text;
+}
+function summarize(error51) {
+  if (error51.kind === "http")
+    return `${error51.status} ${clip(error51.body)}`;
+  if (error51.kind === "timeout")
+    return `timed out after ${error51.timeoutMs}ms`;
+  return clip(error51.cause.message);
+}
 
 // src/shell/platform/downloadBundle.ts
 import { randomBytes } from "node:crypto";
 import { tmpdir as tmpdir2 } from "node:os";
-import { join as join5 } from "node:path";
+import { join as join6 } from "node:path";
 
 // src/shell/platform/fetchSignedUrl.ts
-var timeoutMs2 = 30000;
+var timeoutMs = 30000;
 async function fetchSignedUrl(args, deps = { fetch: globalThis.fetch }) {
   let response;
   try {
     response = await deps.fetch(args.url, {
-      signal: AbortSignal.timeout(timeoutMs2)
+      signal: AbortSignal.timeout(timeoutMs)
     });
   } catch (error51) {
+    if (isTimeoutError(error51)) {
+      return { ok: false, error: { kind: "timeout", timeoutMs } };
+    }
     return { ok: false, error: { cause: toError(error51), kind: "network" } };
   }
   if (!response.ok) {
@@ -171114,8 +171180,17 @@ async function fetchSignedUrl(args, deps = { fetch: globalThis.fetch }) {
       error: { cause: new Error("response had no body"), kind: "network" }
     };
   }
+  let downloaded;
   try {
-    await (deps.fs ?? makeDefaultFs()).writeFile(args.dest, new Uint8Array(await response.arrayBuffer()));
+    downloaded = await response.arrayBuffer();
+  } catch (error51) {
+    if (isTimeoutError(error51)) {
+      return { ok: false, error: { kind: "timeout", timeoutMs } };
+    }
+    return { ok: false, error: { cause: toError(error51), kind: "network" } };
+  }
+  try {
+    await (deps.fs ?? makeDefaultFs()).writeFile(args.dest, new Uint8Array(downloaded));
   } catch (error51) {
     return { ok: false, error: { cause: toError(error51), kind: "network" } };
   }
@@ -171124,7 +171199,7 @@ async function fetchSignedUrl(args, deps = { fetch: globalThis.fetch }) {
 
 // src/shell/platform/downloadBundle.ts
 async function downloadBundle(signedUrl, deps) {
-  const tmpArchive = join5(tmpdir2(), `qawolf-pull-${randomBytes(8).toString("hex")}.tar.gz`);
+  const tmpArchive = join6(tmpdir2(), `qawolf-pull-${randomBytes(8).toString("hex")}.tar.gz`);
   const result = await fetchSignedUrl({ url: signedUrl, dest: tmpArchive }, { fetch: deps.fetch, fs: deps.fs });
   if (!result.ok) {
     await deps.fs.unlink(tmpArchive).catch(() => {});
@@ -171142,15 +171217,19 @@ var identityResponseSchema = exports_external.object({
     slug: exports_external.string().optional()
   })
 });
+var timeoutMs2 = 1e4;
 async function getIdentity(apiKey, deps) {
   const url2 = `${deps.baseUrl}/api/v0/identity`;
   let response;
   try {
     response = await deps.fetch(url2, {
       headers: { Authorization: `Bearer ${apiKey}` },
-      signal: AbortSignal.timeout(1e4)
+      signal: AbortSignal.timeout(timeoutMs2)
     });
   } catch (error51) {
+    if (isTimeoutError(error51)) {
+      return { ok: false, error: { kind: "timeout", timeoutMs: timeoutMs2 } };
+    }
     return {
       ok: false,
       error: { kind: "network", cause: toError(error51) }
@@ -171163,9 +171242,15 @@ async function getIdentity(apiKey, deps) {
       error: { kind: "http", status: response.status, body }
     };
   }
-  const json2 = await response.json().catch(() => {
-    return;
-  });
+  let json2;
+  try {
+    json2 = await response.json();
+  } catch (error51) {
+    if (isTimeoutError(error51)) {
+      return { ok: false, error: { kind: "timeout", timeoutMs: timeoutMs2 } };
+    }
+    json2 = undefined;
+  }
   const parsed = identityResponseSchema.safeParse(json2);
   if (!parsed.success) {
     return { ok: false, error: { kind: "parse", cause: parsed.error } };
@@ -171226,7 +171311,7 @@ async function listTeamStorageFiles(trpc, args, deps) {
 }
 
 // src/shell/platform/teamStorageAssets.ts
-import { dirname as dirname3, join as join8 } from "node:path";
+import { dirname as dirname3, join as join9 } from "node:path";
 
 // src/shell/platform/teamStorageAssetManifest.ts
 import { dirname as dirname2 } from "node:path";
@@ -171303,7 +171388,7 @@ function isUnsafeSegment(segment) {
 
 // src/shell/platform/teamStorageAssetSnapshot.ts
 import { randomBytes as randomBytes2 } from "node:crypto";
-import { join as join6, sep as sep2 } from "node:path";
+import { join as join7, sep as sep2 } from "node:path";
 function mintAssetSnapshotPath(assetsAbs, label) {
   return `${assetsAbs}.${label}-${randomBytes2(8).toString("hex")}`;
 }
@@ -171353,9 +171438,9 @@ function expectedEntries(filePaths) {
   return entries;
 }
 async function collectEntries(root, relDir, out, fs2) {
-  const current = relDir ? join6(root, relDir) : root;
+  const current = relDir ? join7(root, relDir) : root;
   for (const entry of await fs2.readdirWithTypes(current)) {
-    const relPath = relDir ? join6(relDir, entry.name) : entry.name;
+    const relPath = relDir ? join7(relDir, entry.name) : entry.name;
     out.add(relPath);
     if (entry.isDirectory()) {
       await collectEntries(root, relPath, out, fs2);
@@ -171369,7 +171454,7 @@ function setsEqual(left, right) {
 }
 
 // src/shell/platform/teamStorageAssetReuse.ts
-import { join as join7 } from "node:path";
+import { join as join8 } from "node:path";
 async function reusableAssetPaths(assetsAbs, safeFiles, manifest, fs2) {
   const reusable = new Set;
   for (const { file: file2, relativePath } of safeFiles) {
@@ -171385,7 +171470,7 @@ async function canReuseAsset(assetsAbs, relativePath, file2, manifest, fs2) {
   const previous = manifest.get(relativePath);
   if (previous?.etag !== file2.etag)
     return false;
-  return fs2.pathExists(join7(assetsAbs, relativePath));
+  return fs2.pathExists(join8(assetsAbs, relativePath));
 }
 
 // src/shell/platform/teamStorageAssets.ts
@@ -171438,10 +171523,10 @@ async function writeAssetSnapshot(args) {
   let downloadedCount = 0;
   await args.deps.fs.mkdir(args.tmpAssets, { recursive: true });
   for (const { file: file2, relativePath } of args.safeFiles) {
-    const dest = join8(args.tmpAssets, relativePath);
+    const dest = join9(args.tmpAssets, relativePath);
     await args.deps.fs.mkdir(dirname3(dest), { recursive: true });
     if (args.reusable.has(relativePath)) {
-      await args.deps.fs.copyFile(join8(args.assetsAbs, relativePath), dest);
+      await args.deps.fs.copyFile(join9(args.assetsAbs, relativePath), dest);
       continue;
     }
     const result = await fetchSignedUrl({ url: file2.signedUrl, dest }, { fetch: args.deps.fetch, fs: args.deps.fs });
@@ -173437,11 +173522,11 @@ function withAuthContext(signals, fn, deps = {}) {
       loggingSystem.flush();
       return;
     }
-    const platform = (deps.createPlatform ?? createPlatformClient)(resolved.key, { baseUrl: apiBaseUrl, fetch: globalThis.fetch, logger: ctx.log("trpc") });
+    const platformClient = (deps.createPlatform ?? createPlatformClient)(resolved.key, { baseUrl: apiBaseUrl, fetch: globalThis.fetch, logger: ctx.log("trpc") });
     try {
       const result = await fn({
         ...ctx,
-        platform,
+        platformClient,
         apiKeySource: resolved.source
       });
       if (result !== undefined) {
@@ -173487,7 +173572,7 @@ async function handleLogin(ctx) {
       message: authMessages.verifying,
       task: async () => {
         const v = await validateApiKey({
-          platform: createPlatformClient(result.value, {
+          platformClient: createPlatformClient(result.value, {
             baseUrl: ctx.apiBaseUrl,
             fetch: globalThis.fetch
           })
@@ -173553,12 +173638,12 @@ async function handleWhoami(ctx, deps = {}) {
     }
     return { error: "not authenticated" };
   }
-  const platform = (deps.createPlatform ?? createPlatformClient)(resolved.key, {
+  const platformClient = (deps.createPlatform ?? createPlatformClient)(resolved.key, {
     baseUrl: ctx.apiBaseUrl,
     fetch: globalThis.fetch,
     logger: ctx.log("trpc")
   });
-  const identity = await platform.getIdentity();
+  const identity = await platformClient.getIdentity();
   if (!identity.ok) {
     if (ctx.ui.mode === "human") {
       ctx.ui.note(authMessages.whoami.source(resolved.source), authMessages.whoamiFailed);
@@ -173598,7 +173683,7 @@ function registerAuthCommand(program2, signals) {
 // package.json
 var package_default = {
   name: "@qawolf/cli",
-  version: "1.4.0",
+  version: "1.4.2",
   description: "Run and manage QA Wolf flows from the terminal, CI, or an AI agent",
   keywords: [
     "automation",
@@ -173633,7 +173718,8 @@ var package_default = {
     access: "public"
   },
   scripts: {
-    build: "bun run generate && bun scripts/build.ts",
+    build: "bun run build:bundle",
+    "build:bundle": "bun run generate && bun scripts/build.ts",
     "build:binary": "bun run build && bun scripts/buildBinary.ts",
     dev: "bun run src/main.ts",
     format: "oxfmt .",
@@ -173741,38 +173827,41 @@ async function* batchMap(items, fn, size) {
   }
 }
 
+// src/core/nodeModulesBins.ts
+import { join as join10 } from "node:path";
+function nodeModulesBinCandidates(envDir, name, platform) {
+  const binDir = join10(envDir, "node_modules", ".bin");
+  const names = platform === "win32" ? [`${name}.cmd`, `${name}.exe`] : [name];
+  return names.map((shim) => join10(binDir, shim));
+}
+function appiumCliCandidates(envDir, platform) {
+  return nodeModulesBinCandidates(envDir, "appium", platform);
+}
+function playwrightCliCandidates(envDir, platform) {
+  return nodeModulesBinCandidates(envDir, "playwright", platform);
+}
+
 // src/domains/doctor/checks/androidAppium.ts
-import { join as join9 } from "node:path";
 function firstLine(result) {
   return (result.stderr || result.stdout).split(`
 `)[0]?.trim() || `exit code ${result.exitCode}`;
 }
-var appiumHome = join9(envPaths("qawolf").data, "appium");
-function checkAppium(envDir, resolveAppiumBin, checkExists) {
-  if (!envDir) {
-    return {
-      appium: {
-        name: "appium",
-        status: "warn",
-        detail: doctorMessages.appium.noEnvDir
-      },
-      bin: undefined
-    };
-  }
-  const bin = resolveAppiumBin(envDir);
-  if (!checkExists(bin)) {
+function checkAppium(envDir, platform, checkExists) {
+  const candidates = envDir ? appiumCliCandidates(envDir, platform) : [];
+  const bin = candidates.find(checkExists);
+  if (!bin) {
     return {
       appium: {
         name: "appium",
         status: "warn",
-        detail: doctorMessages.appium.binaryMissing(bin)
+        detail: doctorMessages.appium.notFound(candidates[0])
       },
       bin: undefined
     };
   }
   return { appium: { name: "appium", status: "pass" }, bin };
 }
-async function checkUiautomator2(spawn, appiumBin) {
+async function checkUiautomator2(spawn, appiumBin, platform) {
   if (!appiumBin) {
     return {
       name: "uiautomator2-driver",
@@ -173781,7 +173870,8 @@ async function checkUiautomator2(spawn, appiumBin) {
     };
   }
   const result = await spawn(appiumBin, ["driver", "list", "--installed"], {
-    env: { APPIUM_HOME: appiumHome }
+    env: { APPIUM_HOME: getAppiumHome() },
+    platform
   });
   if (result.exitCode !== 0) {
     return {
@@ -173801,6 +173891,30 @@ async function checkUiautomator2(spawn, appiumBin) {
   };
 }
 
+// src/core/androidBins.ts
+import { join as join11 } from "node:path";
+function withExeSuffix(name, platform) {
+  return platform === "win32" ? `${name}.exe` : name;
+}
+function emulatorBin(home, platform) {
+  const name = withExeSuffix("emulator", platform);
+  return home ? join11(home, "emulator", name) : name;
+}
+function adbBin(home, platform) {
+  const name = withExeSuffix("adb", platform);
+  return home ? join11(home, "platform-tools", name) : name;
+}
+function cmdlineToolsBin(home, name, platform) {
+  const file2 = platform === "win32" ? `${name}.bat` : name;
+  return join11(home, "cmdline-tools", "latest", "bin", file2);
+}
+function sdkManagerBin(home, platform) {
+  return cmdlineToolsBin(home, "sdkmanager", platform);
+}
+function avdManagerBin(home, platform) {
+  return cmdlineToolsBin(home, "avdmanager", platform);
+}
+
 // src/domains/doctor/checks/androidSdk.ts
 function firstLine2(result) {
   return (result.stderr || result.stdout).split(`
@@ -173823,9 +173937,9 @@ function checkHome(androidHome, checkExists) {
   }
   return { name: "android-home", status: "pass", detail: androidHome };
 }
-async function checkAdb(spawn, androidHome) {
-  const bin = androidHome ? `${androidHome}/platform-tools/adb` : "adb";
-  const result = await spawn(bin, ["--version"]);
+async function checkAdb(spawn, androidHome, platform) {
+  const bin = adbBin(androidHome, platform);
+  const result = await spawn(bin, ["--version"], { platform });
   if (result.exitCode < 0) {
     return {
       name: "adb",
@@ -173838,9 +173952,9 @@ async function checkAdb(spawn, androidHome) {
   }
   return { name: "adb", status: "pass" };
 }
-async function checkEmulatorBin(spawn, androidHome) {
-  const bin = androidHome ? `${androidHome}/emulator/emulator` : "emulator";
-  const result = await spawn(bin, ["-version"]);
+async function checkEmulatorBin(spawn, androidHome, platform) {
+  const bin = emulatorBin(androidHome, platform);
+  const result = await spawn(bin, ["-version"], { platform });
   if (result.exitCode < 0) {
     return {
       name: "android-emulator",
@@ -173857,11 +173971,11 @@ async function checkEmulatorBin(spawn, androidHome) {
   }
   return { name: "android-emulator", status: "pass" };
 }
-async function checkAvds(spawn, androidHome, requiredAvds) {
+async function checkAvds(spawn, androidHome, requiredAvds, platform) {
   if (requiredAvds.length === 0)
     return [];
-  const bin = androidHome ? `${androidHome}/emulator/emulator` : "emulator";
-  const result = await spawn(bin, ["-list-avds"]);
+  const bin = emulatorBin(androidHome, platform);
+  const result = await spawn(bin, ["-list-avds"], { platform });
   if (result.exitCode < 0) {
     return [
       {
@@ -173898,12 +174012,12 @@ async function checkAvds(spawn, androidHome, requiredAvds) {
 async function checkAndroid(deps) {
   const home = checkHome(deps.androidHome, deps.checkExists);
   const [adb, emulator, avds] = await Promise.all([
-    checkAdb(deps.spawn, deps.androidHome),
-    checkEmulatorBin(deps.spawn, deps.androidHome),
-    checkAvds(deps.spawn, deps.androidHome, deps.requiredAvds)
+    checkAdb(deps.spawn, deps.androidHome, deps.platform),
+    checkEmulatorBin(deps.spawn, deps.androidHome, deps.platform),
+    checkAvds(deps.spawn, deps.androidHome, deps.requiredAvds, deps.platform)
   ]);
-  const { appium, bin } = checkAppium(deps.envDir, deps.resolveAppiumBin, deps.checkExists);
-  const uiautomator2 = await checkUiautomator2(deps.spawn, bin);
+  const { appium, bin } = checkAppium(deps.envDir, deps.platform, deps.checkExists);
+  const uiautomator2 = await checkUiautomator2(deps.spawn, bin, deps.platform);
   return [home, adb, emulator, ...avds, appium, uiautomator2];
 }
 
@@ -174061,10 +174175,19 @@ function compareVersions(a2, b2) {
   return a2[0] - b2[0] || a2[1] - b2[1] || a2[2] - b2[2];
 }
 
+// src/shell/npm.ts
+function resolveNpmCommand(platform) {
+  return platform === "win32" ? "npm.cmd" : "npm";
+}
+
 // src/domains/doctor/checks/npmRegistry.ts
 async function checkNpmRegistry(deps) {
-  const result = await deps.spawn("npm", ["ping"]);
-  if (result.exitCode < 0) {
+  const { platform } = deps;
+  const result = await deps.spawn(resolveNpmCommand(platform), ["ping"], {
+    platform
+  });
+  const cmdNotFound = deps.platform === "win32" && result.exitCode === 9009;
+  if (result.exitCode < 0 || cmdNotFound) {
     return {
       name: "npm-registry",
       status: "warn",
@@ -174081,14 +174204,18 @@ async function checkNpmRegistry(deps) {
 
 // src/domains/doctor/checks/playwright.ts
 async function checkPlaywright(deps) {
-  if (deps.playwrightCliPath === undefined) {
+  const candidates = deps.envDir ? playwrightCliCandidates(deps.envDir, deps.platform) : [];
+  const cliPath = candidates.find(deps.checkExists);
+  if (cliPath === undefined) {
     return {
       name: "playwright",
       status: "fail",
-      detail: doctorMessages.playwright.notFound
+      detail: doctorMessages.playwright.notFound(candidates[0])
     };
   }
-  const result = await deps.spawn(deps.playwrightCliPath, ["--version"]);
+  const result = await deps.spawn(cliPath, ["--version"], {
+    platform: deps.platform
+  });
   if (result.exitCode < 0) {
     return {
       name: "playwright",
@@ -174129,11 +174256,13 @@ async function runChecks(deps) {
     }),
     checkPlaywright({
       spawn: deps.spawn,
-      playwrightCliPath: deps.playwrightCliPath
+      envDir: deps.envDir,
+      platform: deps.platform,
+      checkExists: deps.checkExists
     }),
     checkApiKey({ apiKey: deps.apiKey }),
     checkApiUrl({ fetch: deps.fetch, apiBaseUrl: deps.apiBaseUrl }),
-    checkNpmRegistry({ spawn: deps.spawn }),
+    checkNpmRegistry({ spawn: deps.spawn, platform: deps.platform }),
     checkFileAssets({
       files: deps.flowFiles,
       readFile: deps.readFile,
@@ -174144,8 +174273,8 @@ async function runChecks(deps) {
       androidHome: deps.androidHome,
       checkExists: deps.checkExists,
       envDir: deps.envDir,
-      resolveAppiumBin: deps.resolveAppiumBin,
-      requiredAvds: deps.requiredAvds
+      requiredAvds: deps.requiredAvds,
+      platform: deps.platform
     }) : Promise.resolve([])
   ]);
   return [
@@ -174186,11 +174315,11 @@ function renderResults(ui, results) {
 }
 
 // src/domains/flows/ensureDeps.ts
-import { dirname as dirname4, join as join10 } from "node:path";
+import { dirname as dirname4, join as join12 } from "node:path";
 function findEnvDir(flowPath, fs2) {
   let dir = dirname4(flowPath);
   while (true) {
-    if (fs2.existsSync(join10(dir, "package.json")))
+    if (fs2.existsSync(join12(dir, "package.json")))
       return dir;
     const parent = dirname4(dir);
     if (parent === dir)
@@ -174216,7 +174345,7 @@ function resolveProjectDirSafe(files, fs2) {
 }
 
 // src/domains/flows/expand.ts
-import { join as join11 } from "node:path";
+import { join as join13, resolve as resolve3 } from "node:path";
 
 // node_modules/tinyglobby/dist/index.mjs
 import { readdir, readdirSync, realpath, realpathSync, stat, statSync } from "fs";
@@ -175107,11 +175236,11 @@ function makePeekFlowMeta(fs2) {
   };
 }
 async function resolveGlobRoots(cwd, fs2) {
-  const qawolfPath = join11(cwd, ".qawolf");
+  const qawolfPath = join13(cwd, ".qawolf");
   let envDirs = [];
   try {
     const entries = await fs2.readdirWithTypes(qawolfPath);
-    envDirs = entries.filter((e) => e.isDirectory()).map((e) => join11(qawolfPath, e.name));
+    envDirs = entries.filter((e) => e.isDirectory()).map((e) => join13(qawolfPath, e.name));
   } catch {}
   return [cwd, ...envDirs];
 }
@@ -175125,7 +175254,8 @@ async function expandPatterns(patterns, cwd, logger, fs2) {
       cwd: root,
       absolute: true
     });
-    for (const file2 of matches) {
+    for (const match of matches) {
+      const file2 = resolve3(match);
       seen.add(file2);
       logger?.trace(`found: ${file2}`);
     }
@@ -175135,11 +175265,11 @@ async function expandPatterns(patterns, cwd, logger, fs2) {
 }
 
 // src/domains/runtimeEnv/clearRuntimeEnv.ts
-import { join as join13 } from "node:path";
+import { join as join15 } from "node:path";
 
 // src/domains/runtimeEnv/managedEnvDir.ts
 import { createHash } from "node:crypto";
-import { join as join12, resolve as resolve3 } from "node:path";
+import { join as join14, resolve as resolve4 } from "node:path";
 
 // src/generated/dependencyVersions.ts
 var flowsVersion = "0.1.4";
@@ -175181,20 +175311,20 @@ function managedEnvHash() {
 function managedEnvBaseDir() {
   const override = process.env["QAWOLF_RUNTIME_DIR"]?.trim();
   if (override)
-    return resolve3(override);
-  return join12(getDataDir(), "runtime");
+    return resolve4(override);
+  return join14(getDataDir(), "runtime");
 }
 function runStagingRoot() {
   return `${managedEnvBaseDir()}-runs`;
 }
 function managedEnvDir() {
-  return join12(managedEnvBaseDir(), managedEnvHash());
+  return join14(managedEnvBaseDir(), managedEnvHash());
 }
 async function scaffoldManagedEnv(dir, fs2) {
   await fs2.mkdir(dir, { recursive: true });
   const dependencies = Object.fromEntries(pinnedPackages.map(({ name, version: version2 }) => [name, version2]));
-  await fs2.writeFile(join12(dir, "package.json"), JSON.stringify({ name: "qawolf-runtime", private: true, dependencies }, undefined, 2));
-  await fs2.writeFile(join12(dir, ".npmrc"), `@qawolf:registry=https://registry.npmjs.org/
+  await fs2.writeFile(join14(dir, "package.json"), JSON.stringify({ name: "qawolf-runtime", private: true, dependencies }, undefined, 2));
+  await fs2.writeFile(join14(dir, ".npmrc"), `@qawolf:registry=https://registry.npmjs.org/
 `);
 }
 
@@ -175216,14 +175346,14 @@ async function isManagedRuntimeBase(dir, fs2) {
   for (const entry of entries) {
     if (!entry.isDirectory())
       return false;
-    if (!await hasRuntimeSentinel(join13(dir, entry.name), fs2))
+    if (!await hasRuntimeSentinel(join15(dir, entry.name), fs2))
       return false;
   }
   return true;
 }
 async function hasRuntimeSentinel(hashDir, fs2) {
   try {
-    const pkg = JSON.parse(await fs2.readFile(join13(hashDir, "package.json")));
+    const pkg = JSON.parse(await fs2.readFile(join15(hashDir, "package.json")));
     return pkg.name === runtimeSentinel;
   } catch {
     return false;
@@ -175231,17 +175361,36 @@ async function hasRuntimeSentinel(hashDir, fs2) {
 }
 // src/shell/spawn.ts
 import { spawn } from "node:child_process";
-function buildSpawnOptions(cmd, platform, env2) {
-  const opts = {};
+
+// src/core/cmdEscape.ts
+var metaChars = /([()\][%!^"`<>&|;, *?])/g;
+function escapeCommand(command) {
+  return command.replace(metaChars, "^$1");
+}
+function escapeArgument(arg) {
+  const escaped = arg.replace(/(?=(\\+?)?)\1"/g, "$1$1\\\"").replace(/(?=(\\+?)?)\1$/, "$1$1");
+  return `"${escaped}"`.replace(metaChars, "^$1").replace(metaChars, "^$1");
+}
+
+// src/shell/spawn.ts
+function buildSpawnCommand(cmd, args, platform, env2) {
+  const options = {};
   if (env2)
-    opts.env = env2;
-  if (platform === "win32" && /\.(cmd|bat)$/i.test(cmd))
-    opts.shell = true;
-  return opts;
+    options.env = env2;
+  if (platform !== "win32" || !/\.(cmd|bat)$/i.test(cmd)) {
+    return { cmd, args, options };
+  }
+  const line = [escapeCommand(cmd), ...args.map(escapeArgument)].join(" ");
+  return {
+    cmd: process.env["ComSpec"] ?? "cmd.exe",
+    args: ["/d", "/s", "/c", `"${line}"`],
+    options: { ...options, windowsVerbatimArguments: true }
+  };
 }
-var defaultSpawn = (cmd, args, opts) => new Promise((resolve4) => {
-  const env2 = opts?.env ? { ...process.env, ...opts.env } : undefined;
-  const child = spawn(cmd, args, buildSpawnOptions(cmd, process.platform, env2));
+var defaultSpawn = (cmd, args, opts) => new Promise((resolve5) => {
+  const env2 = opts.env ? { ...process.env, ...opts.env } : undefined;
+  const built = buildSpawnCommand(cmd, args, opts.platform, env2);
+  const child = spawn(built.cmd, built.args, built.options);
   let stdout2 = "";
   let stderr = "";
   child.stdout?.on("data", (chunk) => {
@@ -175254,29 +175403,34 @@ var defaultSpawn = (cmd, args, opts) => new Promise((resolve4) => {
     child.stdin?.write(opts.stdin);
     child.stdin?.end();
   }
-  child.on("error", (err) => resolve4({ exitCode: -1, stdout: stdout2, stderr: stderr || err.message }));
-  child.on("close", (code) => resolve4({ exitCode: code ?? -1, stdout: stdout2, stderr }));
+  child.on("error", (err) => resolve5({ exitCode: -1, stdout: stdout2, stderr: stderr || err.message }));
+  child.on("close", (code) => resolve5({ exitCode: code ?? -1, stdout: stdout2, stderr }));
 });
 
 // src/domains/runtimeEnv/npmInstall.ts
-function spawnNpmInstall(cwd) {
-  return new Promise((resolve4) => {
-    const child = spawn("npm", ["install", "--legacy-peer-deps"], { cwd });
+function buildNpmInstallSpawn(cwd, platform) {
+  const built = buildSpawnCommand(resolveNpmCommand(platform), ["install", "--legacy-peer-deps"], platform, undefined);
+  return { ...built, options: { ...built.options, cwd } };
+}
+function spawnNpmInstall(cwd, spawn2 = spawn) {
+  return new Promise((resolve5) => {
+    const { cmd, args, options } = buildNpmInstallSpawn(cwd, process.platform);
+    const child = spawn2(cmd, args, options);
     let stderr = "";
     child.stdout?.resume();
     child.stderr?.on("data", (chunk) => {
       stderr += String(chunk);
     });
-    child.on("error", (err) => resolve4({ exitCode: -1, stderr: stderr || err.message }));
-    child.on("close", (code) => resolve4({ exitCode: code ?? -1, stderr }));
+    child.on("error", (err) => resolve5({ exitCode: -1, stderr: stderr || err.message }));
+    child.on("close", (code) => resolve5({ exitCode: code ?? -1, stderr }));
   });
 }
 
 // src/domains/runtimeEnv/resolvePinned.ts
-import { join as join14 } from "node:path";
+import { join as join16 } from "node:path";
 function readInstalledVersion(dir, pkgName, fs2) {
   try {
-    const pkgPath = join14(dir, "node_modules", ...pkgName.split("/"), "package.json");
+    const pkgPath = join16(dir, "node_modules", ...pkgName.split("/"), "package.json");
     const raw = JSON.parse(fs2.readFileSync(pkgPath));
     const { version: version2 } = raw;
     return typeof version2 === "string" ? version2 : undefined;
@@ -175284,20 +175438,40 @@ function readInstalledVersion(dir, pkgName, fs2) {
     return;
   }
 }
-function allPinnedResolved(dir, fs2) {
-  const binDir = join14(dir, "node_modules", ".bin");
-  const hasPlaywrightShim = fs2.existsSync(join14(binDir, "playwright")) || fs2.existsSync(join14(binDir, "playwright.cmd"));
-  if (!hasPlaywrightShim) {
-    return false;
+var shims = [
+  { name: "playwright", candidates: playwrightCliCandidates },
+  { name: "appium", candidates: appiumCliCandidates }
+];
+function pinnedResolutionFailures(dir, fs2, platform) {
+  const failures = [];
+  for (const { name, version: version2 } of pinnedPackages) {
+    const installed = readInstalledVersion(dir, name, fs2);
+    if (installed !== version2) {
+      failures.push({ kind: "package", name, pinned: version2, installed });
+    }
   }
-  return pinnedPackages.every(({ name, version: version2 }) => readInstalledVersion(dir, name, fs2) === version2);
+  for (const { name, candidates } of shims) {
+    if (!candidates(dir, platform).some((p2) => fs2.existsSync(p2))) {
+      failures.push({ kind: "shim", name });
+    }
+  }
+  return failures;
+}
+function describePinnedFailure(failure) {
+  if (failure.kind === "shim") {
+    return `node_modules/.bin/${failure.name} (missing)`;
+  }
+  return failure.installed === undefined ? `${failure.name} (missing, pinned ${failure.pinned})` : `${failure.name} ${failure.installed} (pinned ${failure.pinned})`;
+}
+function allPinnedResolved(dir, fs2, platform) {
+  return pinnedResolutionFailures(dir, fs2, platform).length === 0;
 }
 
 // src/domains/runtimeEnv/shimDeps.ts
-import { join as join16 } from "node:path";
+import { join as join18 } from "node:path";
 
 // src/shell/resolveExport.ts
-import { join as join15 } from "node:path";
+import { join as join17 } from "node:path";
 function pickPath(entry, preference) {
   if (typeof entry === "string")
     return entry;
@@ -175329,28 +175503,28 @@ function resolveFromEnvDir(envDir, specifier, preference = "esm", fs2 = makeDefa
   const pkgName = parts.slice(0, pkgPartCount).join("/");
   const rest = parts.slice(pkgPartCount);
   const subpath = rest.length > 0 ? "./" + rest.join("/") : ".";
-  const pkgDir = join15(envDir, "node_modules", ...pkgName.split("/"));
+  const pkgDir = join17(envDir, "node_modules", ...pkgName.split("/"));
   let pkg;
   try {
-    pkg = JSON.parse(fs2.readFileSync(join15(pkgDir, "package.json")));
+    pkg = JSON.parse(fs2.readFileSync(join17(pkgDir, "package.json")));
   } catch (err) {
     if (isNoEntError(err))
-      throw new Error(`Package '${pkgName}' not found in ${join15(envDir, "node_modules")}`, { cause: err });
+      throw new Error(`Package '${pkgName}' not found in ${join17(envDir, "node_modules")}`, { cause: err });
     throw err;
   }
   const exportsMap = normalizeExports(pkg.exports);
   const entry = exportsMap?.[subpath];
   const relative3 = pickPath(entry, preference) ?? (subpath === "." ? pkg.module ?? pkg.main : undefined);
   if (!relative3) {
-    throw new Error(`No entry for "${subpath}" in exports of ${join15(pkgDir, "package.json")}`);
+    throw new Error(`No entry for "${subpath}" in exports of ${join17(pkgDir, "package.json")}`);
   }
-  return join15(pkgDir, relative3);
+  return join17(pkgDir, relative3);
 }
 
 // src/domains/runtimeEnv/shimDeps.ts
 function readShimMarker(shimDir, fs2) {
   try {
-    const pkg = JSON.parse(fs2.readFileSync(join16(shimDir, "package.json")));
+    const pkg = JSON.parse(fs2.readFileSync(join18(shimDir, "package.json")));
     if (pkg._qawolf_format) {
       return {
         _qawolf_version: pkg._qawolf_version ?? "",
@@ -175366,11 +175540,11 @@ function resolveBunBuild(bunBuild) {
   return bunBuild === false ? undefined : { build: bunBuild };
 }
 async function removeStaleShims(flowsDir, flowsDeps, fs2) {
-  const shimsDir = join16(flowsDir, "node_modules");
+  const shimsDir = join18(flowsDir, "node_modules");
   if (!fs2.existsSync(shimsDir))
     return;
   for (const dep of flowsDeps) {
-    const shimDepDir = join16(shimsDir, ...dep.split("/"));
+    const shimDepDir = join18(shimsDir, ...dep.split("/"));
     if (readShimMarker(shimDepDir, fs2)) {
       await fs2.rm(shimDepDir, { recursive: true, force: true });
     }
@@ -175379,17 +175553,17 @@ async function removeStaleShims(flowsDir, flowsDeps, fs2) {
 async function buildDepShim(args) {
   const { envDir, flowsDir, dep, fs: fs2, build: build2 } = args;
   const depParts = dep.split("/");
-  const depDir = join16(envDir, "node_modules", ...depParts);
+  const depDir = join18(envDir, "node_modules", ...depParts);
   if (!fs2.existsSync(depDir))
     return;
   let depVersion;
   try {
-    const pkg = JSON.parse(fs2.readFileSync(join16(depDir, "package.json")));
+    const pkg = JSON.parse(fs2.readFileSync(join18(depDir, "package.json")));
     depVersion = pkg.version ?? "unknown";
   } catch {
     depVersion = "unknown";
   }
-  const shimDir = join16(flowsDir, "node_modules", ...depParts);
+  const shimDir = join18(flowsDir, "node_modules", ...depParts);
   if (fs2.existsSync(shimDir)) {
     const marker = readShimMarker(shimDir, fs2);
     if (!marker)
@@ -175416,20 +175590,20 @@ async function buildDepShim(args) {
   }
   const shimCode = await output.text();
   await fs2.mkdir(shimDir, { recursive: true });
-  await fs2.writeFile(join16(shimDir, "package.json"), JSON.stringify({
+  await fs2.writeFile(join18(shimDir, "package.json"), JSON.stringify({
     name: dep,
     _qawolf_version: depVersion,
     _qawolf_format: "bun-build-v1"
   }));
-  await fs2.writeFile(join16(shimDir, "index.js"), shimCode);
+  await fs2.writeFile(join18(shimDir, "index.js"), shimCode);
 }
 async function shimFlowsDeps(envDir, fs2 = makeDefaultFs(), bunBuild) {
-  const flowsDir = join16(envDir, "node_modules", "@qawolf", "flows");
+  const flowsDir = join18(envDir, "node_modules", "@qawolf", "flows");
   if (!fs2.existsSync(flowsDir))
     return;
   let flowsDeps;
   try {
-    const flowsPkg = JSON.parse(fs2.readFileSync(join16(flowsDir, "package.json")));
+    const flowsPkg = JSON.parse(fs2.readFileSync(join18(flowsDir, "package.json")));
     flowsDeps = Object.keys(flowsPkg.dependencies ?? {});
   } catch {
     return;
@@ -175446,11 +175620,8 @@ async function shimFlowsDeps(envDir, fs2 = makeDefaultFs(), bunBuild) {
 
 // src/domains/runtimeEnv/installPinned.ts
 var defaultSpawnInstall = spawnNpmInstall;
-async function installPinned(targetDir, deps = {
-  fs: makeDefaultFs(),
-  spawnInstall: defaultSpawnInstall
-}) {
-  if (allPinnedResolved(targetDir, deps.fs)) {
+async function installPinned(targetDir, deps) {
+  if (allPinnedResolved(targetDir, deps.fs, deps.platform)) {
     return;
   }
   const tempDir = `${targetDir}.installing.${process.pid}`;
@@ -175465,7 +175636,7 @@ async function installPinned(targetDir, deps = {
   try {
     await deps.fs.rename(tempDir, targetDir);
   } catch (err) {
-    const anotherShardWon = allPinnedResolved(targetDir, deps.fs);
+    const anotherShardWon = allPinnedResolved(targetDir, deps.fs, deps.platform);
     if (anotherShardWon) {
       await deps.fs.rm(tempDir, { recursive: true, force: true });
       return;
@@ -175478,60 +175649,49 @@ async function installPinned(targetDir, deps = {
 async function ensureRuntimeEnv(args, deps = {}) {
   const fs2 = deps.fs ?? makeDefaultFs();
   const resolveManagedDir = deps.resolveManagedDir ?? managedEnvDir;
-  const install = deps.install ?? ((t2) => installPinned(t2, { fs: fs2, spawnInstall: defaultSpawnInstall }));
+  const install = deps.install ?? ((t2) => installPinned(t2, {
+    fs: fs2,
+    spawnInstall: defaultSpawnInstall,
+    platform: args.platform
+  }));
   if (args.overrideDir !== undefined) {
-    if (allPinnedResolved(args.overrideDir, fs2)) {
+    const failures = pinnedResolutionFailures(args.overrideDir, fs2, args.platform);
+    if (failures.length === 0) {
       return {
         depsRoot: args.overrideDir,
         source: "override",
         installed: false
       };
     }
-    throw new Error(`--deps directory ${args.overrideDir} is missing required pinned dependencies. ` + `Run 'npm install' in that directory or point to a valid managed env directory.`);
+    throw new Error(runnerMessages.depsDirIncomplete(args.overrideDir, failures.map(describePinnedFailure)));
   }
-  if (args.projectDir !== undefined && allPinnedResolved(args.projectDir, fs2)) {
+  if (args.projectDir !== undefined && allPinnedResolved(args.projectDir, fs2, args.platform)) {
     return { depsRoot: args.projectDir, source: "project", installed: false };
   }
   const managed = resolveManagedDir();
-  if (allPinnedResolved(managed, fs2)) {
+  if (allPinnedResolved(managed, fs2, args.platform)) {
     return { depsRoot: managed, source: "managed", installed: false };
   }
   await install(managed);
-  if (!allPinnedResolved(managed, fs2)) {
+  if (!allPinnedResolved(managed, fs2, args.platform)) {
     throw new Error(`Managed runtime is incomplete after install at ${managed}.`);
   }
   return { depsRoot: managed, source: "managed", installed: true };
 }
 // src/domains/runtimeEnv/resolveDepsRootIfPresent.ts
 function resolveDepsRootIfPresent(args, fs2 = makeDefaultFs()) {
-  if (args.overrideDir !== undefined && allPinnedResolved(args.overrideDir, fs2))
+  if (args.overrideDir !== undefined && allPinnedResolved(args.overrideDir, fs2, args.platform))
     return args.overrideDir;
-  if (args.projectDir !== undefined && allPinnedResolved(args.projectDir, fs2))
+  if (args.projectDir !== undefined && allPinnedResolved(args.projectDir, fs2, args.platform))
     return args.projectDir;
   const managed = managedEnvDir();
-  if (allPinnedResolved(managed, fs2))
+  if (allPinnedResolved(managed, fs2, args.platform))
     return managed;
   return;
 }
-// src/shell/appium/resolveAppiumBin.ts
-import { join as join17 } from "node:path";
-function resolveAppiumBin(envDir) {
-  return join17(envDir, "node_modules", ".bin", "appium");
-}
-
-// src/shell/playwright.ts
-import { existsSync as existsSync2 } from "node:fs";
-import { join as join18 } from "node:path";
-var notFoundMessage = "Could not find Playwright. Install it in your project (`npm install playwright` or `bun add playwright`).";
-function resolvePlaywrightCli(envDir, platform) {
-  const binDir = join18(envDir, "node_modules", ".bin");
-  const candidates = platform === "win32" ? ["playwright.cmd", "playwright"] : ["playwright"];
-  for (const candidate of candidates) {
-    const full = join18(binDir, candidate);
-    if (existsSync2(full))
-      return full;
-  }
-  throw new Error(notFoundMessage);
+// src/shell/androidSdkHome.ts
+function androidSdkHome() {
+  return process.env["ANDROID_HOME"] ?? process.env["ANDROID_SDK_ROOT"];
 }
 
 // src/commands/doctor/handler.ts
@@ -175551,13 +175711,10 @@ async function handleDoctor(ctx, opts) {
   const cwd = process.cwd();
   const flowFiles = await expandPatterns([], cwd, undefined, fs2);
   const projectDir = resolveProjectDirSafe([...flowFiles], fs2);
-  const envDir = resolveDepsRootIfPresent(projectDir !== undefined ? { projectDir } : {}, fs2);
-  let playwrightCliPath;
-  try {
-    playwrightCliPath = envDir ? resolvePlaywrightCli(envDir, process.platform) : undefined;
-  } catch {
-    playwrightCliPath = undefined;
-  }
+  const envDir = resolveDepsRootIfPresent({
+    platform: process.platform,
+    ...projectDir !== undefined ? { projectDir } : {}
+  }, fs2);
   const resolved = await resolveApiKey(ctx.configDir, fs2);
   const requiredAvds = await collectRequiredAvds(flowFiles, makePeekFlowMeta(fs2));
   const runAndroidChecks = opts.all || requiredAvds.length > 0;
@@ -175576,13 +175733,12 @@ async function handleDoctor(ctx, opts) {
     flowFiles,
     readFile: (path2) => ctx.fs.readFile(path2),
     cwd,
-    playwrightCliPath,
     runAndroidChecks,
-    androidHome: process.env["ANDROID_HOME"] ?? process.env["ANDROID_SDK_ROOT"],
+    androidHome: androidSdkHome(),
     checkExists: (path2) => ctx.fs.existsSync(path2),
     envDir,
-    resolveAppiumBin,
-    requiredAvds
+    requiredAvds,
+    platform: process.platform
   });
   const allResults = [cliCheck, ...results];
   renderResults(ctx.ui, allResults);
@@ -176051,7 +176207,7 @@ var publicContractsV1 = makeContractsV1(defaultIdSchemas);
 
 // src/domains/flows/listRemote.ts
 async function flowsListRemote(ctx, pattern, options) {
-  const result = await ctx.platform.callPublicApi(publicContractsV1.flow.list, {
+  const result = await ctx.platformClient.callPublicApi(publicContractsV1.flow.list, {
     environmentId: options.env,
     includeDrafts: options.includeDrafts
   });
@@ -176090,7 +176246,7 @@ async function flowsListRemote(ctx, pattern, options) {
 }
 
 // src/domains/flows/pull/handler.ts
-import { dirname as dirname7, join as join23, resolve as resolve7 } from "node:path";
+import { dirname as dirname7, join as join23, resolve as resolve8 } from "node:path";
 
 // src/shell/manifest/io.ts
 import { createHash as createHash2 } from "node:crypto";
@@ -176145,18 +176301,18 @@ async function writeManifest(envDir, manifest, fs2 = makeDefaultFs()) {
 `);
 }
 function hashFile(absPath, fs2 = makeDefaultFs()) {
-  return new Promise((resolve4, reject) => {
+  return new Promise((resolve5, reject) => {
     const hash2 = createHash2("sha256");
     const stream = fs2.createReadStream(absPath);
     stream.on("data", (chunk) => hash2.update(chunk));
-    stream.on("end", () => resolve4(hash2.digest("hex")));
+    stream.on("end", () => resolve5(hash2.digest("hex")));
     stream.on("error", reject);
   });
 }
 
 // src/domains/flows/pull/fetchPhase.ts
 async function fetchBundleAndEnvVars(ctx, envId) {
-  const { platform } = ctx;
+  const { platformClient } = ctx;
   let tmpArchive;
   let bundleFetchedAt;
   let envVars;
@@ -176165,7 +176321,7 @@ async function fetchBundleAndEnvVars(ctx, envId) {
     {
       message: flowsMessages.pull.downloadingBundle,
       task: async () => {
-        const result = await platform.downloadBundle(envId);
+        const result = await platformClient.downloadBundle(envId);
         if (!result.ok)
           throw new Error(result.error);
         tmpArchive = result.value.tmpArchive;
@@ -176175,7 +176331,7 @@ async function fetchBundleAndEnvVars(ctx, envId) {
     {
       message: flowsMessages.pull.fetchingEnvVars,
       task: async () => {
-        const result = await platform.getEnvVars(envId);
+        const result = await platformClient.getEnvVars(envId);
         if (!result.ok)
           throw new Error(result.error);
         envVars = result.value;
@@ -176190,10 +176346,10 @@ async function fetchBundleAndEnvVars(ctx, envId) {
 }
 
 // src/domains/flows/pull/safety.ts
-import { resolve as resolve5 } from "node:path";
+import { resolve as resolve6 } from "node:path";
 
 // src/domains/flows/pull/entryPath.ts
-import { isAbsolute as isAbsolute3, posix as posix2, relative as relative3, resolve as resolve4 } from "node:path";
+import { isAbsolute as isAbsolute3, posix as posix2, relative as relative3, resolve as resolve5 } from "node:path";
 function validateEntryPath(name, destResolved) {
   if (!name)
     throw new Error("empty entry name");
@@ -176204,7 +176360,7 @@ function validateEntryPath(name, destResolved) {
   if (normalized === ".." || normalized.startsWith("../")) {
     throw new Error(`path traversal: entry escapes destination (${name})`);
   }
-  const target = resolve4(destResolved, name);
+  const target = resolve5(destResolved, name);
   const rel = relative3(destResolved, target);
   if (rel.startsWith("..") || isAbsolute3(rel)) {
     throw new Error(`path traversal: entry resolves outside destination (${name})`);
@@ -176214,7 +176370,7 @@ function validateEntryPath(name, destResolved) {
 
 // src/domains/flows/pull/safety.ts
 async function detectLocalModifications(envDir, manifest) {
-  const envDirResolved = resolve5(envDir);
+  const envDirResolved = resolve6(envDir);
   const mods = [];
   for (const entry of manifest.flows) {
     const abs = validateEntryPath(entry.path, envDirResolved);
@@ -176481,7 +176637,7 @@ async function writeEnvFile(envDir, vars, fs2 = makeDefaultFs()) {
 }
 
 // src/domains/flows/pull/extract.ts
-import { dirname as dirname6, resolve as resolve6 } from "node:path";
+import { dirname as dirname6, resolve as resolve7 } from "node:path";
 import { createGunzip } from "node:zlib";
 
 // node_modules/tar/dist/esm/index.min.js
@@ -179679,7 +179835,7 @@ async function extractTarGz(tgzPath, destDir, opts = {}, fs3 = makeDefaultFs())
   const maxEntryBytes = opts.maxEntryBytes ?? defaultMaxEntryBytes;
   const maxTotalBytes = opts.maxTotalBytes ?? defaultMaxTotalBytes;
   await fs3.mkdir(destDir, { recursive: true });
-  const destResolved = resolve6(destDir);
+  const destResolved = resolve7(destDir);
   return new Promise((resolveOuter, rejectOuter) => {
     let total = 0;
     let aborted2 = false;
@@ -179848,7 +180004,7 @@ async function handleFlowsPull(ctx, opts, deps) {
     ctx.ui.error(validation.error);
     return { error: validation.error };
   }
-  const destAbs = resolve7(opts.out ?? join23(".qawolf", opts.env));
+  const destAbs = resolve8(opts.out ?? join23(".qawolf", opts.env));
   const assetsAbs = join23(dirname7(destAbs), "assets");
   await resolvedDeps.fs.mkdir(assetsAbs, { recursive: true });
   const yes = opts.yes ?? false;
@@ -179891,7 +180047,7 @@ async function handleFlowsPull(ctx, opts, deps) {
       {
         message: flowsMessages.pull.downloadingTeamStorageAssets,
         task: async () => {
-          const result2 = await ctx.platform.syncTeamStorageAssets(assetsAbs);
+          const result2 = await ctx.platformClient.syncTeamStorageAssets(assetsAbs);
           if (!result2.ok)
             throw new Error(result2.error);
           return result2.value;
@@ -180337,19 +180493,6 @@ import { AsyncLocalStorage } from "node:async_hooks";
 function createRunnerDeps(signals, depsRoot) {
   return {
     fs: makeDefaultFs(),
-    spawn: (cmd, args) => {
-      const child = spawn(cmd, args);
-      const exitCode = new Promise((resolve8) => {
-        child.on("error", () => resolve8(-1));
-        child.on("close", (code) => resolve8(code ?? -1));
-      });
-      return {
-        exitCode,
-        kill: () => {
-          child.kill();
-        }
-      };
-    },
     signals,
     depsRoot,
     createStorage: () => {
@@ -180364,46 +180507,43 @@ function createRunnerDeps(signals, depsRoot) {
   };
 }
 
+// src/shell/importFromPath.ts
+import { pathToFileURL } from "node:url";
+function importFromPath(absPath) {
+  return import(pathToFileURL(absPath).href);
+}
+
 // src/domains/runner/runWebFlowDeps.ts
-async function defaultRunWebFlowDeps(cwd = process.cwd(), signals) {
+async function defaultRunWebFlowDeps(envDir = process.cwd(), signals) {
   let playwright;
   try {
-    const playwrightPath = resolveFromEnvDir(cwd, "playwright");
-    playwright = await import(playwrightPath);
+    const playwrightPath = resolveFromEnvDir(envDir, "playwright");
+    playwright = await importFromPath(playwrightPath);
   } catch (err) {
-    throw new Error("Could not load Playwright. Install it in your project: `npm install playwright` or `bun add playwright`.", { cause: err });
+    throw new Error(runnerMessages.playwrightLoadFailed(envDir, errorMessage(err)), {
+      cause: err
+    });
   }
   const { chromium, firefox, webkit } = playwright;
   return {
     chromium,
     firefox,
     webkit,
-    ...createRunnerDeps(signals, cwd)
+    ...createRunnerDeps(signals, envDir)
   };
 }
 
 // src/domains/runtimeEnv/prepareRunDir.ts
-import { createHash as createHash3 } from "node:crypto";
-import { basename as basename4, dirname as dirname10, join as join29, resolve as resolve8, sep as sep4 } from "node:path";
-
-// src/shell/copyDir.ts
-import { cp, readdir as readdir2 } from "node:fs/promises";
-import { basename as basename3, join as join24 } from "node:path";
-async function copyDirExcluding(source, destination, excludedNames) {
-  const entries = await readdir2(source, { withFileTypes: true });
-  await Promise.all(entries.filter((entry) => !excludedNames.has(entry.name)).map((entry) => cp(join24(source, entry.name), join24(destination, entry.name), {
-    recursive: true,
-    filter: (path3) => !excludedNames.has(basename3(path3))
-  })));
-}
+import { createHash as createHash4 } from "node:crypto";
+import { join as join30, resolve as resolve9 } from "node:path";
 
 // src/domains/runtimeEnv/execSubpathImports.ts
-import { join as join25 } from "node:path";
+import { join as join24 } from "node:path";
 var flowSubpathImports = { "#playwright": "playwright" };
 var packageJsonSchema = exports_external.looseObject({ imports: exports_external.record(exports_external.string(), exports_external.unknown()).catch({}) }).catch({ imports: {} });
 async function writeExecSubpathImports(args) {
   const { execDir, fs: fs3 } = args;
-  const pkgPath = join25(execDir, "package.json");
+  const pkgPath = join24(execDir, "package.json");
   const pkg = packageJsonSchema.parse(await readPackageJson(pkgPath, fs3));
   const merged = { ...pkg, imports: { ...pkg.imports, ...flowSubpathImports } };
   await fs3.writeFile(pkgPath, JSON.stringify(merged, undefined, 2));
@@ -180425,10 +180565,10 @@ async function readPackageJson(pkgPath, fs3) {
 }
 
 // src/domains/runtimeEnv/innerHop.ts
-import { join as join27 } from "node:path";
+import { join as join26 } from "node:path";
 
 // src/domains/runtimeEnv/linkPinnedPackages.ts
-import { dirname as dirname8, join as join26 } from "node:path";
+import { dirname as dirname8, join as join25 } from "node:path";
 
 // src/domains/runtimeEnv/symlinkDir.ts
 import { symlink } from "node:fs/promises";
@@ -180440,16 +180580,16 @@ async function createDirSymlink(source, target) {
 // src/domains/runtimeEnv/linkPinnedPackages.ts
 async function linkPinnedPackages(args) {
   const { depsRoot, nodeModulesDir, fs: fs3 } = args;
-  const managedModules = join26(depsRoot, "node_modules");
+  const managedModules = join25(depsRoot, "node_modules");
   await fs3.mkdir(nodeModulesDir, { recursive: true });
   for (const { name } of pinnedPackages) {
     const segments = name.split("/");
-    const target = join26(nodeModulesDir, ...segments);
+    const target = join25(nodeModulesDir, ...segments);
     if (segments.length > 1) {
       await fs3.mkdir(dirname8(target), { recursive: true });
     }
     await fs3.rm(target, { recursive: true, force: true });
-    await createDirSymlink(join26(managedModules, ...segments), target);
+    await createDirSymlink(join25(managedModules, ...segments), target);
   }
 }
 
@@ -180458,14 +180598,14 @@ async function populateInnerHop(args) {
   const { depsRoot, execDir, fs: fs3 } = args;
   await linkPinnedPackages({
     depsRoot,
-    nodeModulesDir: join27(execDir, "node_modules"),
+    nodeModulesDir: join26(execDir, "node_modules"),
     fs: fs3
   });
 }
 
 // src/domains/runtimeEnv/outerHop.ts
 import { lstat } from "node:fs/promises";
-import { dirname as dirname9, join as join28 } from "node:path";
+import { dirname as dirname9, join as join27 } from "node:path";
 var executorPackageNames = new Set(pinnedPackages.map((p3) => p3.name));
 async function populateOuterHop(args) {
   const { projectDir, runDir, fs: fs3 } = args;
@@ -180475,7 +180615,7 @@ async function populateOuterHop(args) {
   const depNames = Object.keys(installableDeps);
   const { satisfying, rejected } = await findSatisfyingNodeModulesDir(projectDir, depNames, fs3);
   if (satisfying !== undefined) {
-    await createDirSymlink(satisfying, join28(runDir, "node_modules"));
+    await createDirSymlink(satisfying, join27(runDir, "node_modules"));
     return { mode: "symlink", nodeModulesDir: satisfying };
   }
   if (depNames.length === 0)
@@ -180484,7 +180624,7 @@ async function populateOuterHop(args) {
   await installOuterDeps(runDir, installableDeps, fs3, args.install ?? spawnNpmInstall);
   await linkPinnedPackages({
     depsRoot: args.depsRoot,
-    nodeModulesDir: join28(runDir, "node_modules"),
+    nodeModulesDir: join27(runDir, "node_modules"),
     fs: fs3
   });
   return { mode: "install", depCount: depNames.length, rejected };
@@ -180493,10 +180633,10 @@ async function findSatisfyingNodeModulesDir(startDir, depNames, fs3) {
   const rejected = [];
   let dir = startDir;
   while (true) {
-    const candidate = join28(dir, "node_modules");
+    const candidate = join27(dir, "node_modules");
     const stats = await lstatSafe(candidate);
     if (stats !== undefined && stats.isDirectory() && !stats.isSymbolicLink()) {
-      const missing = depNames.filter((name) => !fs3.existsSync(join28(candidate, name, "package.json")));
+      const missing = depNames.filter((name) => !fs3.existsSync(join27(candidate, name, "package.json")));
       if (missing.length === 0)
         return { satisfying: candidate, rejected };
       rejected.push({ dir: candidate, missing });
@@ -180517,7 +180657,7 @@ async function lstatSafe(path3) {
 async function readInstallableDeps(projectDir, fs3) {
   let content;
   try {
-    content = await fs3.readFile(join28(projectDir, "package.json"));
+    content = await fs3.readFile(join27(projectDir, "package.json"));
   } catch {
     return {};
   }
@@ -180535,8 +180675,8 @@ async function readInstallableDeps(projectDir, fs3) {
   return Object.fromEntries(Object.entries(rawDeps).filter(([name]) => !executorPackageNames.has(name)).filter((entry) => typeof entry[1] === "string"));
 }
 async function installOuterDeps(runDir, deps, fs3, install) {
-  await fs3.writeFile(join28(runDir, "package.json"), JSON.stringify({ name: "qawolf-run", private: true, dependencies: deps }, undefined, 2));
-  await fs3.writeFile(join28(runDir, ".npmrc"), `@qawolf:registry=https://registry.npmjs.org/
+  await fs3.writeFile(join27(runDir, "package.json"), JSON.stringify({ name: "qawolf-run", private: true, dependencies: deps }, undefined, 2));
+  await fs3.writeFile(join27(runDir, ".npmrc"), `@qawolf:registry=https://registry.npmjs.org/
 `);
   const result = await install(runDir);
   if (result.exitCode !== 0) {
@@ -180544,16 +180684,61 @@ async function installOuterDeps(runDir, deps, fs3, install) {
   }
 }
 
-// src/domains/runtimeEnv/prepareRunDir.ts
+// src/domains/runtimeEnv/stageFlowFiles.ts
+import { createHash as createHash3 } from "node:crypto";
+import { basename as basename4, dirname as dirname10, join as join29, sep as sep4 } from "node:path";
+
+// src/shell/copyDir.ts
+import { cp, readdir as readdir2 } from "node:fs/promises";
+import { basename as basename3, join as join28 } from "node:path";
+async function copyDirExcluding(source, destination, excludedNames) {
+  const entries = await readdir2(source, { withFileTypes: true });
+  await Promise.all(entries.filter((entry) => !excludedNames.has(entry.name)).map((entry) => cp(join28(source, entry.name), join28(destination, entry.name), {
+    recursive: true,
+    filter: (path3) => !excludedNames.has(basename3(path3))
+  })));
+}
+
+// src/domains/runtimeEnv/stageFlowFiles.ts
 var excludedDirs = new Set(["node_modules", ".git", ".qawolf"]);
+async function stageFlowFiles(args) {
+  const { files, projectDir, execDir, fs: fs3 } = args;
+  if (projectDir !== undefined) {
+    await copyDirExcluding(projectDir, execDir, excludedDirs);
+    return Promise.all(files.map(async (f3) => remapPath(f3, projectDir, execDir) ?? stageOneFile(f3, execDir, fs3)));
+  }
+  if (files.length > 1) {
+    return Promise.all(files.map((f3) => stageOneFile(f3, execDir, fs3)));
+  }
+  await Promise.all(files.map((f3) => fs3.copyFile(f3, join29(execDir, basename4(f3)))));
+  return files.map((f3) => join29(execDir, basename4(f3)));
+}
+async function stageOneFile(file2, execDir, fs3) {
+  const dirHash = createHash3("sha256").update(dirname10(file2)).digest("hex").slice(0, 8);
+  const subDir = join29(execDir, dirHash);
+  await fs3.mkdir(subDir, { recursive: true });
+  const dest = join29(subDir, basename4(file2));
+  await fs3.copyFile(file2, dest);
+  return dest;
+}
+function remapPath(file2, projectDir, execDir) {
+  if (file2 === projectDir)
+    return execDir;
+  if (file2.startsWith(projectDir + sep4)) {
+    return join29(execDir, file2.slice(projectDir.length + 1));
+  }
+  return;
+}
+
+// src/domains/runtimeEnv/prepareRunDir.ts
 async function prepareRunDir(args) {
   const { files, projectDir, depsRoot, runRoot } = args;
   const fs3 = args.fs ?? makeDefaultFs();
   const runId = buildRunId(projectDir, files);
-  const runDir = join29(runRoot, runId);
+  const runDir = join30(runRoot, runId);
   await fs3.rm(runDir, { recursive: true, force: true });
   await fs3.mkdir(runDir, { recursive: true });
-  const execDir = join29(runDir, "exec");
+  const execDir = join30(runDir, "exec");
   await fs3.mkdir(execDir, { recursive: true });
   await populateInnerHop({ depsRoot, execDir, fs: fs3 });
   const stagedFiles = await stageFlowFiles({ files, projectDir, execDir, fs: fs3 });
@@ -180579,49 +180764,22 @@ function buildRunId(projectDir, files) {
   if (seedPath === undefined) {
     throw new Error("prepareRunDir: files must be non-empty when projectDir is undefined");
   }
-  const hash2 = createHash3("sha256").update(resolve8(seedPath)).digest("hex").slice(0, 16);
+  const hash2 = createHash4("sha256").update(resolve9(seedPath)).digest("hex").slice(0, 16);
   return `${hash2}-${process.pid}`;
 }
-async function stageFlowFiles(args) {
-  const { files, projectDir, execDir, fs: fs3 } = args;
-  if (projectDir !== undefined) {
-    await copyDirExcluding(projectDir, execDir, excludedDirs);
-    return files.map((f3) => remapPath(f3, projectDir, execDir));
-  }
-  if (files.length > 1) {
-    return Promise.all(files.map(async (f3) => {
-      const dirHash = createHash3("sha256").update(dirname10(f3)).digest("hex").slice(0, 8);
-      const subDir = join29(execDir, dirHash);
-      await fs3.mkdir(subDir, { recursive: true });
-      const dest = join29(subDir, basename4(f3));
-      await fs3.copyFile(f3, dest);
-      return dest;
-    }));
-  }
-  await Promise.all(files.map((f3) => fs3.copyFile(f3, join29(execDir, basename4(f3)))));
-  return files.map((f3) => join29(execDir, basename4(f3)));
-}
-function remapPath(file2, projectDir, execDir) {
-  if (file2 === projectDir)
-    return execDir;
-  if (file2.startsWith(projectDir + sep4)) {
-    return join29(execDir, file2.slice(projectDir.length + 1));
-  }
-  return file2;
-}
 
 // src/shell/testkit.ts
-import { join as join30 } from "node:path";
+import { join as join31 } from "node:path";
 function notAvailableLocally(name) {
   throw new Error(runnerMessages.notAvailableLocally(name));
 }
 async function loadSdkDeps(cwd) {
-  const testkitDir = join30(cwd, "node_modules", "@qawolf", "testkit");
+  const testkitDir = join31(cwd, "node_modules", "@qawolf", "testkit");
   try {
-    const clientMod = await import(resolveFromEnvDir(cwd, "@qawolf/testkit/client"));
+    const clientMod = await importFromPath(resolveFromEnvDir(cwd, "@qawolf/testkit/client"));
     if (typeof clientMod.createTestkitClient !== "function")
       throw new Error("createTestkitClient is not a function");
-    const scopeMod = await import(join30(testkitDir, "dist", "clientScope.js"));
+    const scopeMod = await importFromPath(join31(testkitDir, "dist", "clientScope.js"));
     if (typeof scopeMod.configureTestkitClient !== "function")
       throw new Error("configureTestkitClient is not a function");
     return {
@@ -180629,7 +180787,7 @@ async function loadSdkDeps(cwd) {
       configureTestkitClient: scopeMod.configureTestkitClient
     };
   } catch (err) {
-    throw new Error("Could not load @qawolf/testkit. Install it in your project: `npm install @qawolf/testkit` or `bun add @qawolf/testkit`.", { cause: err });
+    throw new Error(packageLoadFailed("@qawolf/testkit", cwd, errorMessage(err)), { cause: err });
   }
 }
 async function configureTestkit(cwd, deps) {
@@ -180648,6 +180806,7 @@ function resolveDepsRoot(args) {
   const fs3 = args.fs ?? makeDefaultFs();
   const projectDir = resolveProjectDirSafe(args.files, fs3);
   return ensureRuntimeEnv({
+    platform: args.platform,
     ...projectDir !== undefined ? { projectDir } : {},
     ...args.overrideDir !== undefined ? { overrideDir: args.overrideDir } : {}
   }, { fs: fs3 });
@@ -180657,9 +180816,9 @@ function resolveDepsRoot(args) {
 async function loadSdkDeps2(cwd) {
   try {
     const emailsPath = resolveFromEnvDir(cwd, "@qawolf/emails");
-    return await import(emailsPath);
+    return await importFromPath(emailsPath);
   } catch (err) {
-    throw new Error("Could not load @qawolf/emails. Install it in your project: `npm install @qawolf/emails` or `bun add @qawolf/emails`.", { cause: err });
+    throw new Error(packageLoadFailed("@qawolf/emails", cwd, errorMessage(err)), { cause: err });
   }
 }
 async function configureEmails(config2, cwd, deps) {
@@ -180678,9 +180837,9 @@ async function registerLazyEmailsClient(getInbox, cwd, deps) {
 }
 
 // src/commands/flows/envVarDeps.ts
-import { join as join31 } from "node:path";
+import { join as join32 } from "node:path";
 function envFilePath(envDir) {
-  return join31(envDir, ".env");
+  return join32(envDir, ".env");
 }
 async function readEnv(envDir, fs3) {
   try {
@@ -180715,14 +180874,13 @@ function makeEnvVarDeps(envDir, fs3) {
 }
 
 // src/commands/flows/flowRuntimeDeps.ts
-async function maybeGetIdentityTeamId(platform) {
-  const identity = await platform.getIdentity();
+async function maybeGetIdentityTeamId(platformClient) {
+  const identity = await platformClient.getIdentity();
   return identity.ok ? identity.value.team.id : undefined;
 }
 function lazyGetInbox({
   envDir,
   ctx,
-  platform,
   env: env2,
   resolveApiKeyFn,
   configureEmailsFn,
@@ -180733,16 +180891,13 @@ function lazyGetInbox({
     const explicitEmailerUrl = env2["EMAILER_URL"];
     let teamId = env2["CLOUD_AGENTS_INBOX_TEAM_ID"];
     const apiKeyResult = explicitEmailerUrl === undefined ? await resolveApiKeyFn(ctx.configDir, ctx.fs) : undefined;
-    if (teamId === undefined && platform !== undefined) {
-      teamId = await maybeGetIdentityTeamId(platform);
-    }
     if (teamId === undefined && apiKeyResult !== undefined) {
-      const identityPlatform = createPlatform(apiKeyResult.key, {
+      const identityClient = createPlatform(apiKeyResult.key, {
         baseUrl: ctx.apiBaseUrl,
         fetch: globalThis.fetch,
         ...ctx.log ? { logger: ctx.log("trpc") } : {}
       });
-      teamId = await maybeGetIdentityTeamId(identityPlatform);
+      teamId = await maybeGetIdentityTeamId(identityClient);
     }
     const teamIdPart = teamId !== undefined ? { teamId } : {};
     if (explicitEmailerUrl !== undefined) {
@@ -180764,7 +180919,6 @@ function lazyGetInbox({
 async function createFlowRuntimeDeps({
   envDir,
   ctx,
-  platform,
   env: env2 = process.env,
   resolveApiKeyFn = resolveApiKey,
   configureEmailsFn = configureEmails,
@@ -180773,7 +180927,6 @@ async function createFlowRuntimeDeps({
   const getInbox = lazyGetInbox({
     envDir,
     ctx,
-    platform,
     env: env2,
     resolveApiKeyFn,
     configureEmailsFn,
@@ -180789,30 +180942,38 @@ async function createFlowRuntimeDeps({
 }
 
 // src/shell/appium/createAppiumServer.ts
-import { join as join32 } from "node:path";
+import { existsSync as existsSync2 } from "node:fs";
 
 // src/shell/appium/spawnAppium.ts
 import { spawn as spawn2 } from "node:child_process";
 import net from "node:net";
 import { PassThrough } from "node:stream";
-var findFreePort = () => new Promise((resolve9, reject) => {
+var findFreePort = () => new Promise((resolve10, reject) => {
   const server = net.createServer();
   server.listen(0, () => {
     const addr = server.address();
-    server.close(() => resolve9(addr.port));
+    server.close(() => resolve10(addr.port));
   });
   server.on("error", reject);
 });
-var defaultSpawnAppium = (bin, args, env2) => {
-  const child = spawn2(bin, args, { stdio: ["ignore", "pipe", "pipe"], env: env2 });
+function buildAppiumSpawn(bin, args, platform, env2) {
+  const built = buildSpawnCommand(bin, args, platform, env2);
+  return {
+    ...built,
+    options: { stdio: ["ignore", "pipe", "pipe"], ...built.options }
+  };
+}
+var defaultSpawnAppium = (bin, args, platform, env2) => {
+  const built = buildAppiumSpawn(bin, args, platform, env2);
+  const child = spawn2(built.cmd, built.args, built.options);
   const output = new PassThrough;
   child.stdout?.pipe(output, { end: false });
   child.stderr?.pipe(output, { end: false });
-  const exitCode = new Promise((resolve9, reject) => {
+  const exitCode = new Promise((resolve10, reject) => {
     child.on("error", (err) => reject(new Error(`Failed to spawn Appium: ${err.message}`)));
     child.on("close", (code, signal) => {
       if (code !== null)
-        resolve9(code);
+        resolve10(code);
       else
         reject(new Error(`Appium process killed by signal ${signal ?? "unknown"}`));
     });
@@ -180825,7 +180986,7 @@ var readyBanner = "Appium REST http interface listener started on";
 var defaultStartTimeoutMs = 30000;
 var bannerBufferMaxBytes = 1024;
 function waitForBanner(output, exitCode, timeoutMs3) {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     let done = false;
     function cleanup() {
       done = true;
@@ -180843,7 +181004,7 @@ function waitForBanner(output, exitCode, timeoutMs3) {
       if (buffer.includes(readyBanner)) {
         cleanup();
         output.resume();
-        resolve9();
+        resolve10();
       }
     };
     const timer = setTimeout(() => {
@@ -180863,15 +181024,17 @@ function waitForBanner(output, exitCode, timeoutMs3) {
 async function createAppiumServer(envDir, signals, params) {
   const spawnFn = params?.deps?.spawn ?? defaultSpawnAppium;
   const findFreePortFn = params?.deps?.findFreePort ?? findFreePort;
-  const resolveAppiumBinFn = params?.deps?.resolveAppiumBin ?? resolveAppiumBin;
-  const appiumHome2 = params?.options?.appiumHome ?? join32(envPaths("qawolf").data, "appium");
+  const checkExists = params?.deps?.checkExists ?? existsSync2;
+  const appiumHome = params?.options?.appiumHome ?? getAppiumHome();
   const timeoutMs3 = params?.options?.startTimeoutMs ?? defaultStartTimeoutMs;
-  const bin = resolveAppiumBinFn(envDir);
+  const platform = params?.options?.platform ?? process.platform;
+  const candidates = appiumCliCandidates(envDir, platform);
+  const bin = candidates.find(checkExists);
+  if (!bin) {
+    throw new Error(installMessages.android.appiumNotFound(candidates[0] ?? envDir));
+  }
   const port = await findFreePortFn();
-  const proc = spawnFn(bin, ["--port", String(port), "--log-level", "info"], {
-    ...process.env,
-    APPIUM_HOME: appiumHome2
-  });
+  const proc = spawnFn(bin, ["--port", String(port), "--log-level", "info"], platform, { ...process.env, APPIUM_HOME: appiumHome });
   let stopped = false;
   const stop = () => {
     if (stopped)
@@ -180887,7 +181050,7 @@ async function createAppiumServer(envDir, signals, params) {
   });
   return {
     port,
-    home: appiumHome2,
+    home: appiumHome,
     exited: proc.exitCode,
     stop: () => {
       unregister();
@@ -180897,31 +181060,25 @@ async function createAppiumServer(envDir, signals, params) {
 }
 
 // src/shell/appium/createAndroidEmulator.ts
-import { execFile, spawn as spawn3 } from "node:child_process";
+import { spawn as spawn3 } from "node:child_process";
+
+// src/shell/appium/adb.ts
+import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 var execFileAsync = promisify(execFile);
+var defaultAdb = async (args) => {
+  const { stdout: stdout2 } = await execFileAsync(adbBin(androidSdkHome(), process.platform), args);
+  return { stdout: stdout2 };
+};
+
+// src/shell/appium/createAndroidEmulator.ts
 var defaultBootTimeoutMs = 120000;
 var pollIntervalMs = 2000;
-function androidHome() {
-  return process.env["ANDROID_HOME"] ?? process.env["ANDROID_SDK_ROOT"];
-}
-function emulatorBin() {
-  const home = androidHome();
-  return home ? `${home}/emulator/emulator` : "emulator";
-}
-function adbBin() {
-  const home = androidHome();
-  return home ? `${home}/platform-tools/adb` : "adb";
-}
-var defaultSpawn2 = (bin, args) => {
+var defaultSpawnEmulator = (bin, args) => {
   const child = spawn3(bin, args, { stdio: "ignore" });
   child.unref();
   return { stop: () => child.kill() };
 };
-var defaultAdb = async (args) => {
-  const { stdout: stdout2 } = await execFileAsync(adbBin(), args);
-  return { stdout: stdout2 };
-};
 async function bootSequence(adb, serial, cancelled) {
   await adb(["-s", serial, "wait-for-device"]);
   while (!cancelled()) {
@@ -180938,7 +181095,7 @@ async function bootSequence(adb, serial, cancelled) {
   }
 }
 function waitForBoot(adb, serial, timeoutMs3) {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     let done = false;
     const timer = setTimeout(() => {
       done = true;
@@ -180948,7 +181105,7 @@ function waitForBoot(adb, serial, timeoutMs3) {
       if (!done) {
         done = true;
         clearTimeout(timer);
-        resolve9();
+        resolve10();
       }
     }).catch((err) => {
       if (!done) {
@@ -180961,11 +181118,11 @@ function waitForBoot(adb, serial, timeoutMs3) {
 }
 async function createAndroidEmulator(params) {
   const { avdName, port } = params;
-  const spawnFn = params.deps?.spawn ?? defaultSpawn2;
+  const spawnFn = params.deps?.spawn ?? defaultSpawnEmulator;
   const adbFn = params.deps?.adb ?? defaultAdb;
   const timeoutMs3 = params.options?.bootTimeoutMs ?? defaultBootTimeoutMs;
   const serial = `emulator-${port}`;
-  const proc = spawnFn(emulatorBin(), [
+  const proc = spawnFn(emulatorBin(androidSdkHome(), process.platform), [
     "-avd",
     avdName,
     "-no-audio",
@@ -181052,10 +181209,10 @@ function createEmulatorPool(params) {
       const next = freeSlots.get(avdName)?.shift();
       if (next)
         return Promise.resolve(next);
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve10, reject) => {
         const pending = waiters.get(avdName) ?? [];
         waiters.set(avdName, pending);
-        pending.push({ resolve: resolve9, reject });
+        pending.push({ resolve: resolve10, reject });
       });
     },
     checkIn(slot) {
@@ -181095,61 +181252,6 @@ function createEmulatorPool(params) {
   return pool;
 }
 
-// src/shell/appium/emulatorSetup.ts
-import { execFile as execFile2 } from "node:child_process";
-import { promisify as promisify2 } from "node:util";
-var execFileAsync2 = promisify2(execFile2);
-function adbBin2() {
-  const home = process.env["ANDROID_HOME"] ?? process.env["ANDROID_SDK_ROOT"];
-  return home ? `${home}/platform-tools/adb` : "adb";
-}
-var defaultAdb2 = async (args) => {
-  const { stdout: stdout2 } = await execFileAsync2(adbBin2(), args);
-  return { stdout: stdout2 };
-};
-async function disableAnimations(adb, serial) {
-  await Promise.all([
-    adb([
-      "-s",
-      serial,
-      "shell",
-      "settings",
-      "put",
-      "global",
-      "window_animation_scale",
-      "0.0"
-    ]),
-    adb([
-      "-s",
-      serial,
-      "shell",
-      "settings",
-      "put",
-      "global",
-      "transition_animation_scale",
-      "0.0"
-    ]),
-    adb([
-      "-s",
-      serial,
-      "shell",
-      "settings",
-      "put",
-      "global",
-      "animator_duration_scale",
-      "0.0"
-    ])
-  ]);
-}
-async function dismissKeyguard(adb, serial) {
-  await adb(["-s", serial, "shell", "input", "keyevent", "KEYCODE_WAKEUP"]);
-  await adb(["-s", serial, "shell", "wm", "dismiss-keyguard"]);
-}
-async function configureEmulator(adb, serial) {
-  await disableAnimations(adb, serial);
-  await dismissKeyguard(adb, serial);
-}
-
 // src/domains/runner/runAndroidFlowDeps.ts
 async function createSession(port, serial) {
   const { remote: remote2 } = await Promise.resolve().then(() => (init_node3(), exports_node));
@@ -181171,7 +181273,7 @@ async function createSession(port, serial) {
   };
 }
 function createAndroidDeps(envDir, signals) {
-  const pool = createEmulatorPool({ signals, deps: { adb: defaultAdb2 } });
+  const pool = createEmulatorPool({ signals, deps: { adb: defaultAdb } });
   const serverHandle = { port: 0, home: "", stop: () => {} };
   let serverStarted = false;
   const deps = {
@@ -181179,11 +181281,10 @@ function createAndroidDeps(envDir, signals) {
     appiumServer: serverHandle,
     emulatorPool: pool,
     createSession,
-    adb: defaultAdb2
+    adb: defaultAdb
   };
   const boot = async (avdNames) => {
-    const androidHome2 = process.env["ANDROID_HOME"] ?? process.env["ANDROID_SDK_ROOT"];
-    if (!androidHome2) {
+    if (!androidSdkHome()) {
       throw new Error(`ANDROID_HOME is not set. Set it to the Android SDK path.
 Install Android Studio and open Tools > SDK Manager.`);
     }
@@ -181233,11 +181334,18 @@ async function findFlowStamp(flowAbsPath) {
 
 // src/domains/install/browsers.ts
 async function installBrowserList(ctx, browsers, deps) {
+  const candidates = playwrightCliCandidates(deps.envDir, deps.platform);
+  const cliPath = candidates.find(deps.checkExists);
+  if (!cliPath) {
+    throw new Error(installMessages.playwrightNotFound(candidates[0] ?? deps.envDir));
+  }
   await ctx.ui.withProgress(browsers.map((browser) => ({
     message: installMessages.installingBrowser(browser),
     task: async () => {
       const args = buildArgs(browser, deps.platform, deps.browserDeps);
-      const result = await deps.spawn(deps.playwrightCliPath, args);
+      const result = await deps.spawn(cliPath, args, {
+        platform: deps.platform
+      });
       if (result.exitCode !== 0) {
         throw new Error(formatError2(browser, result));
       }
@@ -181252,12 +181360,12 @@ async function installBrowsers(ctx, pattern, deps) {
     ctx.ui.info(installMessages.noBrowserFlows);
     return;
   }
-  const playwrightCliPath = await deps.resolvePlaywrightCliPath(files);
   await installBrowserList(ctx, browsers, {
     spawn: deps.spawn,
     platform: deps.platform,
     browserDeps: deps.browserDeps,
-    playwrightCliPath
+    envDir: await deps.resolveDepsRoot(files),
+    checkExists: deps.checkExists
   });
 }
 async function collectBrowsers(files, peekFlowMeta) {
@@ -181289,12 +181397,58 @@ import path12 from "node:path";
 // src/shell/appium/createAndroidLaunchContext.ts
 import { writeFile } from "node:fs/promises";
 import path8 from "node:path";
+
+// src/shell/appium/emulatorSetup.ts
+async function disableAnimations(adb, serial) {
+  await Promise.all([
+    adb([
+      "-s",
+      serial,
+      "shell",
+      "settings",
+      "put",
+      "global",
+      "window_animation_scale",
+      "0.0"
+    ]),
+    adb([
+      "-s",
+      serial,
+      "shell",
+      "settings",
+      "put",
+      "global",
+      "transition_animation_scale",
+      "0.0"
+    ]),
+    adb([
+      "-s",
+      serial,
+      "shell",
+      "settings",
+      "put",
+      "global",
+      "animator_duration_scale",
+      "0.0"
+    ])
+  ]);
+}
+async function dismissKeyguard(adb, serial) {
+  await adb(["-s", serial, "shell", "input", "keyevent", "KEYCODE_WAKEUP"]);
+  await adb(["-s", serial, "shell", "wm", "dismiss-keyguard"]);
+}
+async function configureEmulator(adb, serial) {
+  await disableAnimations(adb, serial);
+  await dismissKeyguard(adb, serial);
+}
+
+// src/shell/appium/createAndroidLaunchContext.ts
 var defaultWriteFile = (filePath, data2) => writeFile(filePath, data2);
 function createAndroidLaunchContext({
   deps,
   options
 }) {
-  const adbFn = deps.adb ?? defaultAdb2;
+  const adbFn = deps.adb ?? defaultAdb;
   const writeFileFn = deps.writeFile ?? defaultWriteFile;
   let slot;
   let driver;
@@ -181349,7 +181503,7 @@ function createAndroidLaunchContext({
 
 // src/domains/runner/loadFlowDefault.ts
 import path11 from "node:path";
-import { pathToFileURL } from "node:url";
+import { pathToFileURL as pathToFileURL2 } from "node:url";
 
 // src/shell/resolver/detectRuntimeCapabilities.ts
 import nodeModule2 from "node:module";
@@ -181550,7 +181704,7 @@ async function importBundledFlow(flowPath, code, fs9) {
   const tempPath = path11.join(path11.dirname(flowPath), `.${path11.basename(flowPath)}.qawolf-bundle.mjs`);
   await fs9.writeFile(tempPath, code);
   try {
-    return await importDefaultExport(pathToFileURL(tempPath).href, flowPath);
+    return await importDefaultExport(pathToFileURL2(tempPath).href, flowPath);
   } finally {
     await fs9.rm(tempPath, { force: true });
   }
@@ -181564,7 +181718,7 @@ async function loadFlowDefault(args) {
   } = args;
   if (bundleFlow === undefined) {
     await registerFlowLoader();
-    return importDefaultExport(pathToFileURL(flowPath).href, flowPath);
+    return importDefaultExport(pathToFileURL2(flowPath).href, flowPath);
   }
   const code = await bundleFlow(flowPath, depsRoot);
   return importBundledFlow(flowPath, code, fs9);
@@ -181741,7 +181895,7 @@ import path17 from "node:path";
 
 // src/domains/runner/initFlowRuntime.ts
 import path13 from "node:path";
-import { pathToFileURL as pathToFileURL2 } from "node:url";
+import { pathToFileURL as pathToFileURL3 } from "node:url";
 async function runnerPathInDir(dir, fs9) {
   const pkgPath = path13.join(dir, "node_modules", "@qawolf", "flows", "package.json");
   try {
@@ -181782,7 +181936,7 @@ async function doInit(flowPath, timeout, fs9, depsRoot) {
   } else {
     runnerPath = await findFlowsRunnerPath(flowPath, fs9);
   }
-  const mod = await import(pathToFileURL2(runnerPath).href);
+  const mod = await import(pathToFileURL3(runnerPath).href);
   if (typeof mod.configureFlowRuntime !== "function")
     throw new Error(`@qawolf/flows _runner at ${runnerPath} does not export configureFlowRuntime`);
   await mod.configureFlowRuntime({
@@ -182190,8 +182344,8 @@ function lastNonEmptyLine(text3) {
   return lines[lines.length - 1];
 }
 async function runWorkerOnce(args) {
-  const { spawn: spawn4, command, prefixArgs, flow, optionsJson, workerEnv } = args;
-  const result = await spawn4(command, [...prefixArgs, "flows", "__run-worker", flow.file], workerEnv !== undefined ? { stdin: optionsJson, env: workerEnv } : { stdin: optionsJson });
+  const { spawn: spawn4, command, prefixArgs, flow, optionsJson, platform, workerEnv } = args;
+  const result = await spawn4(command, [...prefixArgs, "flows", "__run-worker", flow.file], workerEnv !== undefined ? { stdin: optionsJson, env: workerEnv, platform } : { stdin: optionsJson, platform });
   const line = lastNonEmptyLine(result.stdout);
   if (line !== undefined) {
     try {
@@ -182214,6 +182368,7 @@ function createSubprocessDispatch(env3) {
     spawn: env3.spawn,
     command: env3.command,
     prefixArgs: env3.prefixArgs,
+    platform: env3.platform,
     workerEnv: env3.workerEnv,
     flow,
     optionsJson: serializeWorkerInput({
@@ -182233,6 +182388,7 @@ function makePooledDispatch(resolvedDir) {
       spawn: defaultSpawn,
       command,
       prefixArgs,
+      platform: process.platform,
       workerEnv,
       resolvedDir,
       webOptions,
@@ -182495,7 +182651,8 @@ function buildFlowsRunDeps(args) {
       spawn: defaultSpawn,
       platform: process.platform,
       browserDeps: flags.browserDeps,
-      playwrightCliPath: resolvePlaywrightCli(resolvedDir, process.platform)
+      envDir: resolvedDir,
+      checkExists: (path9) => ctx.fs.existsSync(path9)
     }),
     runWebFlow,
     runWebFlowDeps: { ...runWebFlowDeps, flowRuntimeDeps },
@@ -182546,6 +182703,7 @@ async function runStagedFlows(args) {
       message: runnerMessages.preparingEnvironment,
       task: () => deps.resolveDepsRoot({
         files,
+        platform: process.platform,
         ...flags.deps !== undefined ? { overrideDir: flags.deps } : {}
       })
     }
@@ -182623,7 +182781,7 @@ async function handleFlowsRun(ctx, pattern, flags, deps) {
 }
 
 // src/commands/flows/hybridRunDefaults.ts
-import { join as join36, resolve as resolve9 } from "node:path";
+import { join as join36, resolve as resolve10 } from "node:path";
 function makeDefaultHybridDeps(fs9) {
   return {
     expandPatterns: (patterns, cwd, logger) => expandPatterns(patterns, cwd, logger, fs9),
@@ -182642,7 +182800,7 @@ async function handleHybridFlowsRun(ctx, pattern, flags, deps) {
   if (validation !== "ok") {
     return { error: validation.error, exitCode: 2 };
   }
-  const envDir = resolve9(join36(".qawolf", flags.env));
+  const envDir = resolve10(join36(".qawolf", flags.env));
   const patternArgs = buildPatternArgs(pattern);
   const globFlows = () => resolvedDeps.expandPatterns(patternArgs, envDir, ctx.log("flows"));
   let files = await globFlows();
@@ -182918,27 +183076,29 @@ Examples:
   });
 }
 
-// src/commands/install/android.ts
-import { join as join40 } from "node:path";
-
 // src/domains/install/android/index.ts
 import { parseExecutionTarget as parseExecutionTarget4 } from "@qawolf/flow-targets";
 
 // src/domains/install/android/avd.ts
 import { join as join38 } from "node:path";
 async function installAvds(ctx, specs, deps) {
-  const versionResult = await deps.spawn(deps.sdkManagerPath, ["--version"]);
+  const sdkManagerPath = sdkManagerBin(deps.androidHome, deps.platform);
+  const avdManagerPath = avdManagerBin(deps.androidHome, deps.platform);
+  const versionResult = await deps.spawn(sdkManagerPath, ["--version"], {
+    platform: deps.platform
+  });
   if (versionResult.exitCode !== 0) {
-    throw new Error(installMessages.android.sdkmanagerNotFound(deps.sdkManagerPath));
+    throw new Error(installMessages.android.sdkmanagerNotFound(sdkManagerPath));
   }
   const licenseFile = join38(deps.androidHome, "licenses", "android-sdk-license");
   if (deps.checkExists(licenseFile)) {
     ctx.ui.info(installMessages.android.licensesAlreadyAccepted);
   } else {
     ctx.ui.step(installMessages.android.acceptingLicenses);
-    await deps.spawn(deps.sdkManagerPath, ["--licenses"], {
+    await deps.spawn(sdkManagerPath, ["--licenses"], {
       stdin: `y
-`.repeat(20)
+`.repeat(20),
+      platform: deps.platform
     });
   }
   const installedImages = new Set;
@@ -182952,7 +183112,9 @@ async function installAvds(ctx, specs, deps) {
       continue;
     }
     ctx.ui.step(installMessages.android.installingSystemImage(spec.systemImage));
-    const result = await deps.spawn(deps.sdkManagerPath, [spec.systemImage]);
+    const result = await deps.spawn(sdkManagerPath, [spec.systemImage], {
+      platform: deps.platform
+    });
     if (result.exitCode !== 0) {
       const detail = (result.stderr || result.stdout).split(`
 `).map((l2) => l2.trim()).find(Boolean) ?? `exit code ${result.exitCode}`;
@@ -182960,11 +183122,9 @@ async function installAvds(ctx, specs, deps) {
     }
     installedImages.add(spec.systemImage);
   }
-  const listResult = await deps.spawn(deps.avdManagerPath, [
-    "list",
-    "avd",
-    "-c"
-  ]);
+  const listResult = await deps.spawn(avdManagerPath, ["list", "avd", "-c"], {
+    platform: deps.platform
+  });
   const existingAvds = new Set(listResult.stdout.split(`
 `).map((s3) => s3.trim()).filter(Boolean));
   for (const spec of specs) {
@@ -182973,7 +183133,7 @@ async function installAvds(ctx, specs, deps) {
       continue;
     }
     ctx.ui.step(installMessages.android.creatingAvd(spec.avdName));
-    const result = await deps.spawn(deps.avdManagerPath, [
+    const result = await deps.spawn(avdManagerPath, [
       "create",
       "avd",
       "-n",
@@ -182983,7 +183143,7 @@ async function installAvds(ctx, specs, deps) {
       "-d",
       spec.deviceId,
       "--force"
-    ]);
+    ], { platform: deps.platform });
     if (result.exitCode !== 0) {
       const detail = (result.stderr || result.stdout).split(`
 `).map((l2) => l2.trim()).find(Boolean) ?? `exit code ${result.exitCode}`;
@@ -182993,18 +183153,20 @@ async function installAvds(ctx, specs, deps) {
 }
 
 // src/domains/install/android/driver.ts
-import { join as join39 } from "node:path";
-var appiumEnv = {
-  APPIUM_HOME: join39(envPaths("qawolf").data, "appium")
-};
 async function installUiautomator2Driver(ctx, deps) {
-  const listResult = await deps.spawn(deps.appiumBinPath, ["driver", "list", "--installed"], { env: appiumEnv });
+  const appiumEnv = { APPIUM_HOME: getAppiumHome() };
+  const candidates = appiumCliCandidates(deps.envDir, deps.platform);
+  const appiumBinPath = candidates.find(deps.checkExists);
+  if (!appiumBinPath) {
+    throw new Error(installMessages.android.appiumNotFound(candidates[0] ?? deps.envDir));
+  }
+  const listResult = await deps.spawn(appiumBinPath, ["driver", "list", "--installed"], { env: appiumEnv, platform: deps.platform });
   if ((listResult.stdout + listResult.stderr).includes("uiautomator2")) {
     ctx.ui.info(installMessages.android.uiautomator2AlreadyInstalled);
     return;
   }
   ctx.ui.step(installMessages.android.installingUiautomator2);
-  const installResult = await deps.spawn(deps.appiumBinPath, ["driver", "install", `uiautomator2@${appiumUiautomator2DriverVersion}`], { env: appiumEnv });
+  const installResult = await deps.spawn(appiumBinPath, ["driver", "install", `uiautomator2@${appiumUiautomator2DriverVersion}`], { env: appiumEnv, platform: deps.platform });
   if (installResult.exitCode !== 0) {
     const output = installResult.stderr + installResult.stdout;
     if (output.includes("already installed")) {
@@ -183029,15 +183191,15 @@ async function installAndroid(ctx, pattern, deps) {
   const specs = buildAvdSpecs(targets, deps.arch);
   await installAvds(ctx, specs, {
     spawn: deps.spawn,
-    sdkManagerPath: deps.sdkManagerPath,
-    avdManagerPath: deps.avdManagerPath,
     androidHome: deps.androidHome,
-    checkExists: deps.checkExists
+    checkExists: deps.checkExists,
+    platform: deps.platform
   });
-  const depsRoot = await deps.resolveDepsRoot(files);
   await installUiautomator2Driver(ctx, {
     spawn: deps.spawn,
-    appiumBinPath: deps.resolveAppiumBin(depsRoot)
+    envDir: await deps.resolveDepsRoot(files),
+    platform: deps.platform,
+    checkExists: deps.checkExists
   });
   ctx.ui.success(`Android install complete. ${pluralize(specs.length, "unique AVD")} ready.`);
 }
@@ -183071,8 +183233,8 @@ function buildAvdSpecs(targets, arch) {
 
 // src/commands/install/android.ts
 async function handleInstallAndroid(ctx, pattern, envDir) {
-  const androidHome2 = process.env["ANDROID_HOME"] ?? process.env["ANDROID_SDK_ROOT"];
-  if (!androidHome2) {
+  const androidHome = androidSdkHome();
+  if (!androidHome) {
     return { error: installMessages.androidSdkNotFound };
   }
   const { fs: fs9 } = ctx;
@@ -183080,14 +183242,12 @@ async function handleInstallAndroid(ctx, pattern, envDir) {
     cwd: process.cwd(),
     spawn: defaultSpawn,
     arch: process.arch,
-    androidHome: androidHome2,
+    androidHome,
     checkExists: (path9) => fs9.existsSync(path9),
-    sdkManagerPath: join40(androidHome2, "cmdline-tools", "latest", "bin", "sdkmanager"),
-    avdManagerPath: join40(androidHome2, "cmdline-tools", "latest", "bin", "avdmanager"),
+    platform: process.platform,
     expandPatterns: (patterns, cwd) => expandPatterns(patterns, cwd ?? process.cwd(), undefined, fs9),
     peekFlowMeta: makePeekFlowMeta(fs9),
-    resolveDepsRoot: async (files) => envDir ?? (await resolveDepsRoot({ files, fs: fs9 })).depsRoot,
-    resolveAppiumBin
+    resolveDepsRoot: async (files) => envDir ?? (await resolveDepsRoot({ files, fs: fs9, platform: process.platform })).depsRoot
   });
 }
 
@@ -183103,10 +183263,8 @@ async function handleInstallBrowsers(ctx, pattern, options) {
     browserDeps,
     expandPatterns: (patterns, dir) => expandPatterns(patterns, dir ?? cwd, undefined, fs9),
     peekFlowMeta: makePeekFlowMeta(fs9),
-    resolvePlaywrightCliPath: async (files) => {
-      const depsRoot = envDir ?? (await resolveDepsRoot({ files, fs: fs9 })).depsRoot;
-      return resolvePlaywrightCli(depsRoot, process.platform);
-    }
+    checkExists: (path9) => fs9.existsSync(path9),
+    resolveDepsRoot: async (files) => envDir ?? (await resolveDepsRoot({ files, fs: fs9, platform: process.platform })).depsRoot
   });
 }
 
@@ -183171,7 +183329,7 @@ async function handleInstall(ctx, pattern, options) {
     cwd: process.cwd(),
     expandPatterns: (patterns, cwd) => expandPatterns(patterns, cwd ?? process.cwd(), undefined, fs9),
     peekFlowMeta: makePeekFlowMeta(fs9),
-    resolveDepsRoot: (files) => resolveDepsRoot({ files, fs: fs9 }),
+    resolveDepsRoot: (files) => resolveDepsRoot({ files, fs: fs9, platform: process.platform }),
     installBrowsers: (innerCtx, innerPattern, envDir) => handleInstallBrowsers(innerCtx, innerPattern, {
       envDir,
       browserDeps: options.browserDeps
@@ -183507,7 +183665,7 @@ async function handlePublicApiCommand(ctx, spec, options) {
   const parsed = spec.contract.input.safeParse(assembled.input);
   if (!parsed.success)
     return { error: exports_external.prettifyError(parsed.error) };
-  const result = await ctx.platform.callPublicApi(spec.contract, parsed.data);
+  const result = await ctx.platformClient.callPublicApi(spec.contract, parsed.data);
   if (!result.ok)
     return { error: result.error };
   ctx.ui.output(result.value, renderHuman(result.value));
@@ -183587,4 +183745,4 @@ createProgram({ signals }).parseAsync().catch(() => {
     process.exitCode = 1;
 }).finally(() => flushAndExit(typeof process.exitCode === "number" ? process.exitCode : 0));
 
-//# debugId=F2AE77060354D60864756E2164756E21
+//# debugId=393CFE300FA7E35C64756E2164756E21