@swmansion/argent 0.7.1 → 0.8.0

package/dist/tool-server.cjs

@@ -17652,6 +17652,7 @@ var require_path_to_regexp = __commonJS({
           }
           pos = offset + match.length;
           if (match === "*") {
+            backtrack = "";
             extraOffset += 3;
             return "(.*)";
           }
@@ -17672,6 +17673,7 @@ var require_path_to_regexp = __commonJS({
             offset: offset + extraOffset
           });
           var result = "(?:" + format + slash + capture + (star ? "((?:[/" + format + "].+?)?)" : "") + ")" + optional;
+          backtrack = "";
           extraOffset += result.length - match.length;
           return result;
         }
@@ -23413,6 +23415,47 @@ var require_coerce = __commonJS({
   }
 });
 
+// ../../node_modules/semver/functions/truncate.js
+var require_truncate = __commonJS({
+  "../../node_modules/semver/functions/truncate.js"(exports2, module2) {
+    "use strict";
+    var parse = require_parse2();
+    var constants = require_constants();
+    var SemVer = require_semver();
+    var truncate = (version2, truncation, options) => {
+      if (!constants.RELEASE_TYPES.includes(truncation)) {
+        return null;
+      }
+      const clonedVersion = cloneInputVersion(version2, options);
+      return clonedVersion && doTruncation(clonedVersion, truncation);
+    };
+    var cloneInputVersion = (version2, options) => {
+      const versionStringToParse = version2 instanceof SemVer ? version2.version : version2;
+      return parse(versionStringToParse, options);
+    };
+    var doTruncation = (version2, truncation) => {
+      if (isPrerelease(truncation)) {
+        return version2.version;
+      }
+      version2.prerelease = [];
+      switch (truncation) {
+        case "major":
+          version2.minor = 0;
+          version2.patch = 0;
+          break;
+        case "minor":
+          version2.patch = 0;
+          break;
+      }
+      return version2.format();
+    };
+    var isPrerelease = (type) => {
+      return type.startsWith("pre");
+    };
+    module2.exports = truncate;
+  }
+});
+
 // ../../node_modules/semver/internal/lrucache.js
 var require_lrucache = __commonJS({
   "../../node_modules/semver/internal/lrucache.js"(exports2, module2) {
@@ -24447,6 +24490,7 @@ var require_semver2 = __commonJS({
     var lte = require_lte();
     var cmp = require_cmp();
     var coerce2 = require_coerce();
+    var truncate = require_truncate();
     var Comparator = require_comparator();
     var Range = require_range2();
     var satisfies = require_satisfies();
@@ -24485,6 +24529,7 @@ var require_semver2 = __commonJS({
       lte,
       cmp,
       coerce: coerce2,
+      truncate,
       Comparator,
       Range,
       satisfies,
@@ -30631,6 +30676,8 @@ var require_Alias = __commonJS({
        * instance of the `source` anchor before this node.
        */
       resolve(doc, ctx) {
+        if (ctx?.maxAliasCount === 0)
+          throw new ReferenceError("Alias resolution is disabled");
         let nodes;
         if (ctx?.aliasResolveCache) {
           nodes = ctx.aliasResolveCache;
@@ -31703,18 +31750,18 @@ var require_merge = __commonJS({
     };
     var isMergeKey = (ctx, key) => (merge.identify(key) || identity.isScalar(key) && (!key.type || key.type === Scalar.Scalar.PLAIN) && merge.identify(key.value)) && ctx?.doc.schema.tags.some((tag2) => tag2.tag === merge.tag && tag2.default);
     function addMergeToJSMap(ctx, map, value) {
-      value = ctx && identity.isAlias(value) ? value.resolve(ctx.doc) : value;
-      if (identity.isSeq(value))
-        for (const it of value.items)
+      const source = resolveAliasValue(ctx, value);
+      if (identity.isSeq(source))
+        for (const it of source.items)
           mergeValue(ctx, map, it);
-      else if (Array.isArray(value))
-        for (const it of value)
+      else if (Array.isArray(source))
+        for (const it of source)
           mergeValue(ctx, map, it);
       else
-        mergeValue(ctx, map, value);
+        mergeValue(ctx, map, source);
     }
     function mergeValue(ctx, map, value) {
-      const source = ctx && identity.isAlias(value) ? value.resolve(ctx.doc) : value;
+      const source = resolveAliasValue(ctx, value);
       if (!identity.isMap(source))
         throw new Error("Merge sources must be maps or map aliases");
       const srcMap = source.toJSON(null, ctx, Map);
@@ -31735,6 +31782,9 @@ var require_merge = __commonJS({
       }
       return map;
     }
+    function resolveAliasValue(ctx, value) {
+      return ctx && identity.isAlias(value) ? value.resolve(ctx.doc, ctx) : value;
+    }
     exports2.addMergeToJSMap = addMergeToJSMap;
     exports2.isMergeKey = isMergeKey;
     exports2.merge = merge;
@@ -32372,7 +32422,7 @@ var require_stringifyNumber = __commonJS({
       if (!isFinite(num))
         return isNaN(num) ? ".nan" : num < 0 ? "-.inf" : ".inf";
       let n = Object.is(value, -0) ? "-0" : JSON.stringify(value);
-      if (!format && minFractionDigits && (!tag2 || tag2 === "tag:yaml.org,2002:float") && /^\d/.test(n)) {
+      if (!format && minFractionDigits && (!tag2 || tag2 === "tag:yaml.org,2002:float") && /^-?\d/.test(n) && !n.includes("e")) {
         let i = n.indexOf(".");
         if (i < 0) {
           i = n.length;
@@ -34744,7 +34794,7 @@ var require_resolve_flow_scalar = __commonJS({
             while (next === " " || next === "	")
               next = source[++i + 1];
           } else if (next === "x" || next === "u" || next === "U") {
-            const length = { x: 2, u: 4, U: 8 }[next];
+            const length = next === "x" ? 2 : next === "u" ? 4 : 8;
             res += parseCharCode(source, i + 1, length, onError);
             i += length;
           } else {
@@ -34819,12 +34869,13 @@ var require_resolve_flow_scalar = __commonJS({
       const cc = source.substr(offset, length);
       const ok = cc.length === length && /^[0-9a-fA-F]+$/.test(cc);
       const code = ok ? parseInt(cc, 16) : NaN;
-      if (isNaN(code)) {
+      try {
+        return String.fromCodePoint(code);
+      } catch {
         const raw = source.substr(offset - 2, length + 2);
         onError(offset - 2, "BAD_DQ_ESCAPE", `Invalid escape sequence ${raw}`);
         return raw;
       }
-      return String.fromCodePoint(code);
     }
     exports2.resolveFlowScalar = resolveFlowScalar;
   }
@@ -35174,8 +35225,10 @@ ${cb}` : comment;
           }
         }
         if (afterDoc) {
-          Array.prototype.push.apply(doc.errors, this.errors);
-          Array.prototype.push.apply(doc.warnings, this.warnings);
+          for (let i = 0; i < this.errors.length; ++i)
+            doc.errors.push(this.errors[i]);
+          for (let i = 0; i < this.warnings.length; ++i)
+            doc.warnings.push(this.warnings[i]);
         } else {
           doc.errors = this.errors;
           doc.warnings = this.warnings;
@@ -35908,7 +35961,7 @@ var require_lexer = __commonJS({
           const n = (yield* this.pushCount(1)) + (yield* this.pushSpaces(true));
           this.indentNext = this.indentValue + 1;
           this.indentValue += n;
-          return yield* this.parseBlockStart();
+          return "block-start";
         }
         return "doc";
       }
@@ -36207,28 +36260,38 @@ var require_lexer = __commonJS({
         return 0;
       }
       *pushIndicators() {
-        switch (this.charAt(0)) {
-          case "!":
-            return (yield* this.pushTag()) + (yield* this.pushSpaces(true)) + (yield* this.pushIndicators());
-          case "&":
-            return (yield* this.pushUntil(isNotAnchorChar)) + (yield* this.pushSpaces(true)) + (yield* this.pushIndicators());
-          case "-":
-          // this is an error
-          case "?":
-          // this is an error outside flow collections
-          case ":": {
-            const inFlow = this.flowLevel > 0;
-            const ch1 = this.charAt(1);
-            if (isEmpty(ch1) || inFlow && flowIndicatorChars.has(ch1)) {
-              if (!inFlow)
-                this.indentNext = this.indentValue + 1;
-              else if (this.flowKey)
-                this.flowKey = false;
-              return (yield* this.pushCount(1)) + (yield* this.pushSpaces(true)) + (yield* this.pushIndicators());
+        let n = 0;
+        loop: while (true) {
+          switch (this.charAt(0)) {
+            case "!":
+              n += yield* this.pushTag();
+              n += yield* this.pushSpaces(true);
+              continue loop;
+            case "&":
+              n += yield* this.pushUntil(isNotAnchorChar);
+              n += yield* this.pushSpaces(true);
+              continue loop;
+            case "-":
+            // this is an error
+            case "?":
+            // this is an error outside flow collections
+            case ":": {
+              const inFlow = this.flowLevel > 0;
+              const ch1 = this.charAt(1);
+              if (isEmpty(ch1) || inFlow && flowIndicatorChars.has(ch1)) {
+                if (!inFlow)
+                  this.indentNext = this.indentValue + 1;
+                else if (this.flowKey)
+                  this.flowKey = false;
+                n += yield* this.pushCount(1);
+                n += yield* this.pushSpaces(true);
+                continue loop;
+              }
             }
           }
+          break loop;
         }
-        return 0;
+        return n;
       }
       *pushTag() {
         if (this.charAt(1) === "<") {
@@ -36387,6 +36450,13 @@ var require_parser = __commonJS({
       }
       return prev.splice(i, prev.length);
     }
+    function arrayPushArray(target, source) {
+      if (source.length < 1e5)
+        Array.prototype.push.apply(target, source);
+      else
+        for (let i = 0; i < source.length; ++i)
+          target.push(source[i]);
+    }
     function fixFlowSeqItems(fc) {
       if (fc.start.type === "flow-seq-start") {
         for (const it of fc.items) {
@@ -36396,11 +36466,11 @@ var require_parser = __commonJS({
             delete it.key;
             if (isFlowToken(it.value)) {
               if (it.value.end)
-                Array.prototype.push.apply(it.value.end, it.sep);
+                arrayPushArray(it.value.end, it.sep);
               else
                 it.value.end = it.sep;
             } else
-              Array.prototype.push.apply(it.start, it.sep);
+              arrayPushArray(it.start, it.sep);
             delete it.sep;
           }
         }
@@ -36755,7 +36825,7 @@ var require_parser = __commonJS({
                 const prev = map.items[map.items.length - 2];
                 const end = prev?.value?.end;
                 if (Array.isArray(end)) {
-                  Array.prototype.push.apply(end, it.start);
+                  arrayPushArray(end, it.start);
                   end.push(this.sourceToken);
                   map.items.pop();
                   return;
@@ -36943,7 +37013,7 @@ var require_parser = __commonJS({
                 const prev = seq.items[seq.items.length - 2];
                 const end = prev?.value?.end;
                 if (Array.isArray(end)) {
-                  Array.prototype.push.apply(end, it.start);
+                  arrayPushArray(end, it.start);
                   end.push(this.sourceToken);
                   seq.items.pop();
                   return;
@@ -41951,7 +42021,7 @@ var import_node_https = __toESM(require("node:https"));
 var import_semver = __toESM(require_semver2());
 
 // ../tool-server/package.json
-var version = "0.7.1";
+var version = "0.8.0";
 
 // ../tool-server/src/utils/update-checker.ts
 var PACKAGE_NAME = "@swmansion/argent";
@@ -42111,6 +42181,11 @@ var net = __toESM(require("node:net"));
 var fs2 = __toESM(require("node:fs"));
 var import_node_util3 = require("node:util");
 var import_node_child_process3 = require("node:child_process");
+
+// ../tool-server/src/utils/simctl-config.ts
+var SIMCTL_SPAWN_TIMEOUT_MS = 1e4;
+
+// ../tool-server/src/blueprints/ax-service.ts
 var execFileAsync3 = (0, import_node_util3.promisify)(import_node_child_process3.execFile);
 var AX_SERVICE_NAMESPACE = "AXService";
 function axServiceRef(device) {
@@ -42165,17 +42240,21 @@ async function pingDaemon(socketPath) {
   }
 }
 async function ensureAutomationEnabled(udid) {
-  await execFileAsync3("xcrun", [
-    "simctl",
-    "spawn",
-    udid,
-    "defaults",
-    "write",
-    "com.apple.Accessibility",
-    "AutomationEnabled",
-    "-bool",
-    "true"
-  ]);
+  await execFileAsync3(
+    "xcrun",
+    [
+      "simctl",
+      "spawn",
+      udid,
+      "defaults",
+      "write",
+      "com.apple.Accessibility",
+      "AutomationEnabled",
+      "-bool",
+      "true"
+    ],
+    { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
+  );
 }
 async function killExistingDaemon(socketPath) {
   try {
@@ -42741,6 +42820,10 @@ function sortAndroid(a, b) {
   const bEmu = b.isEmulator ? 0 : 1;
   return aEmu - bEmu;
 }
+function readinessRank(d) {
+  if (d.platform === "ios") return d.state === "Booted" ? 0 : 1;
+  return d.state === "device" ? 0 : 1;
+}
 var zodSchema = external_exports.object({});
 var listDevicesTool = {
   id: "list-devices",
@@ -42770,7 +42853,9 @@ Booted/ready devices are listed first. Platforms whose CLI is unavailable are si
       sdkLevel: d.sdkLevel
     }));
     androidTagged.sort(sortAndroid);
-    return { devices: [...iosTagged, ...androidTagged], avds };
+    const devices = [...iosTagged, ...androidTagged];
+    devices.sort((a, b) => readinessRank(a) - readinessRank(b));
+    return { devices, avds };
   }
 };
 
@@ -43058,6 +43143,36 @@ var import_node_child_process7 = require("node:child_process");
 var import_node_util6 = require("node:util");
 var execFileAsync6 = (0, import_node_util6.promisify)(import_node_child_process7.execFile);
 var NATIVE_DEVTOOLS_NAMESPACE = "NativeDevtools";
+var MAX_NATIVE_DEVTOOLS_INIT_ATTEMPTS = 3;
+function buildInitFailedResult(udid, failure) {
+  return {
+    status: "init_failed",
+    message: `Native devtools failed to initialize for ${udid} after ${failure.attempts} attempts. Last error: ${failure.lastError}. Try shutting down and re-booting the simulator, or restart CoreSimulatorService.`,
+    attempts: failure.attempts
+  };
+}
+async function precheckNativeDevtools(api, udid, bundleId) {
+  const existing = api.getInitFailure();
+  if (existing?.givenUp) return buildInitFailedResult(udid, existing);
+  try {
+    await api.ensureEnvReady();
+  } catch {
+    const failure = api.getInitFailure();
+    if (failure) return buildInitFailedResult(udid, failure);
+    return buildInitFailedResult(udid, {
+      attempts: 1,
+      lastError: "ensureEnvReady threw without recording state",
+      givenUp: false
+    });
+  }
+  if (bundleId !== void 0 && await api.requiresAppRestart(bundleId)) {
+    return {
+      status: "restart_required",
+      message: "Native devtools are not injected into the running app. Call restart-app then retry."
+    };
+  }
+  return null;
+}
 function nativeDevtoolsRef(device) {
   return {
     urn: `${NATIVE_DEVTOOLS_NAMESPACE}:${device.id}`,
@@ -43096,17 +43211,21 @@ async function ensureAccessibilityEnabled(udid) {
   const flags = ["AccessibilityEnabled", "ApplicationAccessibilityEnabled"];
   await Promise.all(
     flags.map(
-      (flag) => execFileAsync6("xcrun", [
-        "simctl",
-        "spawn",
-        udid,
-        "defaults",
-        "write",
-        "com.apple.Accessibility",
-        flag,
-        "-bool",
-        "true"
-      ])
+      (flag) => execFileAsync6(
+        "xcrun",
+        [
+          "simctl",
+          "spawn",
+          udid,
+          "defaults",
+          "write",
+          "com.apple.Accessibility",
+          flag,
+          "-bool",
+          "true"
+        ],
+        { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
+      )
     )
   );
 }
@@ -43115,30 +43234,22 @@ async function ensureEnv(udid, socketPath) {
   const result = await execFileAsync6(
     "xcrun",
     ["simctl", "spawn", udid, "launchctl", "getenv", "DYLD_INSERT_LIBRARIES"],
-    { encoding: "utf8" }
+    { encoding: "utf8", timeout: SIMCTL_SPAWN_TIMEOUT_MS }
   ).catch((e) => ({ stdout: e.stdout ?? "" }));
   const existing = (result.stdout ?? "").trim();
   const updated = buildDyldInsertLibraries(existing, bootstrapPath);
   if (updated !== existing) {
-    await execFileAsync6("xcrun", [
-      "simctl",
-      "spawn",
-      udid,
-      "launchctl",
-      "setenv",
-      "DYLD_INSERT_LIBRARIES",
-      updated
-    ]);
+    await execFileAsync6(
+      "xcrun",
+      ["simctl", "spawn", udid, "launchctl", "setenv", "DYLD_INSERT_LIBRARIES", updated],
+      { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
+    );
   }
-  await execFileAsync6("xcrun", [
-    "simctl",
-    "spawn",
-    udid,
-    "launchctl",
-    "setenv",
-    "NATIVE_DEVTOOLS_IOS_CDP_SOCKET",
-    socketPath
-  ]);
+  await execFileAsync6(
+    "xcrun",
+    ["simctl", "spawn", udid, "launchctl", "setenv", "NATIVE_DEVTOOLS_IOS_CDP_SOCKET", socketPath],
+    { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
+  );
   await ensureAccessibilityEnabled(udid);
 }
 async function listRunningUIKitApplicationBundleIds(udid) {
@@ -43179,11 +43290,33 @@ var nativeDevtoolsBlueprint = {
     const pendingRpc = /* @__PURE__ */ new Map();
     let nextRpcId = 1;
     let envSetup = false;
+    let initFailure = null;
+    let inFlight = null;
     const activatedBundleIds = /* @__PURE__ */ new Set();
     const events = new TypedEventEmitter();
-    const ensureEnvReady = async () => {
-      await ensureEnv(udid, socketPath);
-      envSetup = true;
+    const noteInitFailure = (err) => {
+      const lastError = err instanceof Error ? err.message : String(err);
+      const attempts = (initFailure?.attempts ?? 0) + 1;
+      const givenUp = attempts >= MAX_NATIVE_DEVTOOLS_INIT_ATTEMPTS;
+      initFailure = { attempts, lastError, givenUp };
+      const message = givenUp ? `[native-devtools] giving up on ${udid} after ${attempts} attempts: ${lastError}
+` : `[native-devtools] init attempt ${attempts}/${MAX_NATIVE_DEVTOOLS_INIT_ATTEMPTS} failed for ${udid}: ${lastError}
+`;
+      process.stderr.write(message);
+    };
+    const ensureEnvReady = () => {
+      if (envSetup || initFailure?.givenUp) return Promise.resolve();
+      if (inFlight) return inFlight;
+      inFlight = Promise.resolve().then(() => ensureEnv(udid, socketPath)).then(() => {
+        envSetup = true;
+        initFailure = null;
+      }).catch((err) => {
+        noteInitFailure(err);
+        throw err;
+      }).finally(() => {
+        inFlight = null;
+      });
+      return inFlight;
     };
     const isAppRunning = async (bundleId) => {
       const runningBundleIds = await listRunningUIKitApplicationBundleIds(udid);
@@ -43282,11 +43415,13 @@ var nativeDevtoolsBlueprint = {
       });
     });
     server.listen(socketPath);
-    await ensureEnvReady();
+    await ensureEnvReady().catch(() => {
+    });
     const api = {
       isEnvSetup: () => envSetup,
       socketPath,
       ensureEnvReady,
+      getInitFailure: () => initFailure,
       isConnected: (bundleId) => connections2.has(bundleId),
       isAppRunning,
       listConnectedBundleIds: () => [...connections2.keys()],
@@ -43407,7 +43542,8 @@ Fails if the simulator server is not running for the given UDID or the bundleId
   }),
   async execute(services, params) {
     const api = services.nativeDevtools;
-    await api.ensureEnvReady();
+    const blocked = await precheckNativeDevtools(api, params.udid);
+    if (blocked) return blocked;
     const appRunning = await api.isAppRunning(params.bundleId);
     const connected = api.isConnected(params.bundleId);
     const envSetup = api.isEnvSetup();
@@ -43443,12 +43579,8 @@ Fails if native devtools are not connected or the app is not running.`,
   }),
   async execute(services, params) {
     const api = services.nativeDevtools;
-    if (await api.requiresAppRestart(params.bundleId)) {
-      return {
-        status: "restart_required",
-        message: "Native devtools are not injected into the running app. Call restart-app then retry."
-      };
-    }
+    const blocked = await precheckNativeDevtools(api, params.udid, params.bundleId);
+    if (blocked) return blocked;
     api.activateNetworkInspection(params.bundleId);
     const events = api.getNetworkLog(params.bundleId).slice(-params.limit);
     if (params.clear) api.clearNetworkLog(params.bundleId);
@@ -43486,12 +43618,8 @@ Fails if native devtools are not connected, the app is not running, or status is
   }),
   async execute(services, params) {
     const api = services.nativeDevtools;
-    if (await api.requiresAppRestart(params.bundleId)) {
-      return {
-        status: "restart_required",
-        message: "Native devtools are not injected into the running app. Call restart-app then retry."
-      };
-    }
+    const blocked = await precheckNativeDevtools(api, params.udid, params.bundleId);
+    if (blocked) return blocked;
     const rpcParams = {};
     if (params.className !== void 0) rpcParams.className = params.className;
     if (params.identifier !== void 0) rpcParams.identifier = params.identifier;
@@ -43546,12 +43674,8 @@ Fails if native devtools are not connected or the app is not running.`,
   }),
   async execute(services, params) {
     const api = services.nativeDevtools;
-    if (await api.requiresAppRestart(params.bundleId)) {
-      return {
-        status: "restart_required",
-        message: "Native devtools are not injected into the running app. Call restart-app then retry."
-      };
-    }
+    const blocked = await precheckNativeDevtools(api, params.udid, params.bundleId);
+    if (blocked) return blocked;
     const rpcParams = {};
     if (params.fields !== void 0) rpcParams.fields = params.fields;
     if (params.skipClasses !== void 0) rpcParams.skipClasses = params.skipClasses;
@@ -43633,12 +43757,8 @@ If status is restart_required: call restart-app then retry.`,
   }),
   async execute(services, params) {
     const api = services.nativeDevtools;
-    if (await api.requiresAppRestart(params.bundleId)) {
-      return {
-        status: "restart_required",
-        message: "Native devtools are not injected into the running app. Call restart-app then retry."
-      };
-    }
+    const blocked = await precheckNativeDevtools(api, params.udid, params.bundleId);
+    if (blocked) return blocked;
     const rpcParams = {};
     if (params.skipClasses !== void 0) rpcParams.skipClasses = params.skipClasses;
     if (params.skipClassPrefixes !== void 0)
@@ -43694,12 +43814,8 @@ If status is restart_required: call restart-app then retry.`,
   }),
   async execute(services, params) {
     const api = services.nativeDevtools;
-    if (await api.requiresAppRestart(params.bundleId)) {
-      return {
-        status: "restart_required",
-        message: "Native devtools are not injected into the running app. Call restart-app then retry."
-      };
-    }
+    const blocked = await precheckNativeDevtools(api, params.udid, params.bundleId);
+    if (blocked) return blocked;
     const rpcParams = {
       x: params.x,
       y: params.y
@@ -43761,12 +43877,8 @@ If status is restart_required: call restart-app then retry.`,
   }),
   async execute(services, params) {
     const api = services.nativeDevtools;
-    if (await api.requiresAppRestart(params.bundleId)) {
-      return {
-        status: "restart_required",
-        message: "Native devtools are not injected into the running app. Call restart-app then retry."
-      };
-    }
+    const blocked = await precheckNativeDevtools(api, params.udid, params.bundleId);
+    if (blocked) return blocked;
     const rpcParams = {
       x: params.x,
       y: params.y
@@ -45554,7 +45666,11 @@ async function bootIos(udid, registry) {
   });
   await execFileAsync7("xcrun", ["simctl", "bootstatus", udid, "-b"]);
   const ndRef = nativeDevtoolsRef({ id: udid, platform: "ios", kind: "simulator" });
-  await registry.resolveService(ndRef.urn, ndRef.options);
+  const ndApi = await registry.resolveService(ndRef.urn, ndRef.options);
+  const initFailure = ndApi.getInitFailure();
+  if (initFailure?.givenUp) {
+    return buildInitFailedResult(udid, initFailure);
+  }
   await execFileAsync7("defaults", [
     "write",
     "com.apple.iphonesimulator",
@@ -45882,7 +45998,8 @@ var execFileAsync8 = (0, import_node_util8.promisify)(import_node_child_process9
 var iosImpl = {
   requires: ["xcrun"],
   handler: async (services, params) => {
-    await services.nativeDevtools.ensureEnvReady();
+    const blocked = await precheckNativeDevtools(services.nativeDevtools, params.udid);
+    if (blocked) return blocked;
     await execFileAsync8("xcrun", ["simctl", "launch", params.udid, params.bundleId]);
     return { launched: true, bundleId: params.bundleId };
   }
@@ -45982,7 +46099,8 @@ var iosImpl2 = {
   requires: ["xcrun"],
   handler: async (services, params) => {
     const { udid, bundleId } = params;
-    await services.nativeDevtools.ensureEnvReady();
+    const blocked = await precheckNativeDevtools(services.nativeDevtools, udid);
+    if (blocked) return blocked;
     try {
       await execFileAsync9("xcrun", ["simctl", "terminate", udid, bundleId]);
     } catch {
@@ -47652,7 +47770,7 @@ function buildTextTree(data, opts) {
     lines.push(`Screen: ${screenW}x${screenH}`);
     lines.push("");
   }
-  function formatLabel(c) {
+  function formatLabel2(c) {
     let label = c.name;
     const displayText = c.text ?? c.accLabel;
     if (displayText) label += ` "${displayText}"`;
@@ -47674,12 +47792,12 @@ function buildTextTree(data, opts) {
         cur = childrenOf.get(cur)[0];
       }
       const indent = "  ".repeat(depth);
-      lines.push(`${indent}${formatLabel(c)}`);
+      lines.push(`${indent}${formatLabel2(c)}`);
       lines.push(`${indent}  ... via ${chainLen} wrapper${chainLen > 1 ? "s" : ""}`);
       renderNode(cur, depth + 1);
       return;
     }
-    lines.push("  ".repeat(depth) + formatLabel(c));
+    lines.push("  ".repeat(depth) + formatLabel2(c));
     const children = childrenOf.get(id);
     if (children) {
       let prevSibling = null;
@@ -48301,7 +48419,7 @@ function formatEntry(entry) {
 }
 var zodSchema31 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port"),
-  device_id: external_exports.string().describe("iOS Simulator UDID (logicalDeviceId)."),
+  device_id: external_exports.string().describe("Device UDID (logicalDeviceId)."),
   pageIndex: external_exports.union([external_exports.coerce.number().int().nonnegative(), external_exports.literal("latest")]).default("latest").describe(
     'Page index (0-based) or "latest" for the most recent page. Each page contains up to 50 entries.'
   )
@@ -48375,7 +48493,7 @@ function redactHeaders(headers) {
 var MAX_BODY_SIZE = 1e3;
 var zodSchema32 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port"),
-  device_id: external_exports.string().describe("iOS Simulator UDID (logicalDeviceId)."),
+  device_id: external_exports.string().describe("Device UDID (logicalDeviceId)."),
   requestId: external_exports.string().describe("The requestId from view-network-logs to get full details for"),
   includeBody: external_exports.coerce.boolean().default(true).describe("Whether to include the response body (if captured). Defaults to true.")
 });
@@ -49082,7 +49200,116 @@ async function describeIos(registry, device, params) {
   }
 }
 
+// ../tool-server/src/tools/describe/format-tree.ts
+var CONTENT_ROLES = /* @__PURE__ */ new Set([
+  // iOS AX traits surfaced by mapNativeTraitsToDescribeRole. AXGroup is
+  // deliberately excluded: it's the catch-all wrapper, so requiring it to
+  // carry its own label/value before we emit a line keeps decorative
+  // groupings out of the output.
+  "AXButton",
+  "AXStaticText",
+  "AXImage",
+  "AXLink",
+  "AXTextField",
+  "AXHeading",
+  "AXTabBar",
+  "AXAdjustable"
+]);
+function clampFinite(n) {
+  return Number.isFinite(n) ? n : 0;
+}
+function fmtFrame(f) {
+  return `(${clampFinite(f.x).toFixed(3)}, ${clampFinite(f.y).toFixed(3)}, ${clampFinite(
+    f.width
+  ).toFixed(3)}, ${clampFinite(f.height).toFixed(3)})`;
+}
+function escapeForLine(s) {
+  return s.replace(/\\/g, "\\\\").replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t");
+}
+function formatLabel(label) {
+  if (!label) return "";
+  return `"${escapeForLine(label)}"`;
+}
+function formatAttr(name, value) {
+  if (!value) return "";
+  return ` ${name}="${escapeForLine(value)}"`;
+}
+function formatFlags(n) {
+  const flags = [];
+  if (n.clickable) flags.push("clickable");
+  if (n.longClickable) flags.push("long-clickable");
+  if (n.scrollable) flags.push("scrollable");
+  if (n.checkable) flags.push(n.checked ? "checked" : "checkable");
+  if (n.disabled) flags.push("disabled");
+  if (n.password) flags.push("password");
+  if (typeof n.scrollHidden === "number" && n.scrollHidden > 0) {
+    flags.push(`scrollHidden=${n.scrollHidden}`);
+  }
+  return flags.length === 0 ? "" : ` [${flags.join(",")}]`;
+}
+function hasContent(n) {
+  return Boolean(
+    n.label || n.value || n.identifier || n.clickable || n.longClickable || n.scrollable || n.checkable || typeof n.scrollHidden === "number" && n.scrollHidden > 0
+  );
+}
+function shouldEmit(n) {
+  return hasContent(n) || CONTENT_ROLES.has(n.role);
+}
+function formatLine(n, indent) {
+  const pad = "  ".repeat(indent);
+  const dedupedValue = n.value && n.value !== n.label ? n.value : void 0;
+  const labelPart = formatLabel(n.label);
+  const valuePart = formatAttr("value", dedupedValue);
+  const idPart = formatAttr("id", n.identifier);
+  const flagPart = formatFlags(n);
+  const annotations = `${labelPart}${valuePart}${idPart}${flagPart}`.trim();
+  const annotated = annotations ? ` ${annotations}` : "";
+  return `${pad}${n.role}${annotated}  ${fmtFrame(n.frame)}`;
+}
+function renderFlat(root) {
+  return root.children.filter(shouldEmit).slice().sort((a, b) => a.frame.y - b.frame.y || a.frame.x - b.frame.x).map((n) => formatLine(n, 1));
+}
+function renderNested(root) {
+  const lines = [];
+  const stack = [];
+  for (let i = root.children.length - 1; i >= 0; i--) {
+    stack.push({ node: root.children[i], depth: 1 });
+  }
+  while (stack.length > 0) {
+    const { node, depth } = stack.pop();
+    if (shouldEmit(node) || node.children.length > 0) {
+      lines.push(formatLine(node, depth));
+    }
+    for (let i = node.children.length - 1; i >= 0; i--) {
+      stack.push({ node: node.children[i], depth: depth + 1 });
+    }
+  }
+  return lines;
+}
+function formatDescribeTree(root, opts) {
+  const mode = opts.source === "uiautomator" ? "nested" : "flat";
+  const header = [];
+  header.push(`Source: ${opts.source}`);
+  header.push(`Mode: ${mode}`);
+  header.push(
+    "Coordinates are normalized [0,1] fractions of the screen (x, y, width, height), not pixels \u2014 pass them straight to gesture-tap / gesture-swipe / gesture-pinch, which expect this same space. To tap an element, use its centre: tap_x = frame.x + frame.width / 2, tap_y = frame.y + frame.height / 2."
+  );
+  header.push("");
+  header.push(`ROOT  ${root.role} ${fmtFrame(root.frame)}`);
+  header.push("");
+  const body = mode === "flat" ? renderFlat(root) : renderNested(root);
+  return [...header, ...body].join("\n").replace(/\n+$/, "\n");
+}
+
 // ../tool-server/src/tools/describe/index.ts
+function withDescription(data) {
+  const out = {
+    description: formatDescribeTree(data.tree, { source: data.source }),
+    source: data.source
+  };
+  if (data.should_restart) out.should_restart = data.should_restart;
+  return out;
+}
 var zodSchema33 = external_exports.object({
   udid: external_exports.string().min(1).describe("Target device id from `list-devices` (iOS UDID or Android serial)."),
   bundleId: external_exports.string().optional().describe(
@@ -49103,11 +49330,14 @@ system dialogs, permission prompts, and any foreground app content. On Android,
 When a system dialog is visible, describe returns the dialog's interactive elements (buttons, text)
 with tap coordinates. When no dialog is present, it returns the foreground app's accessible elements.
 
-Returns a JSON tree of UI elements with roles, labels, values, and frame coordinates in normalized
-[0,1] space (fractions of the screen, not pixels) \u2014 the same coordinate space as tap/swipe/gesture
-and simulator-server touch input.
+Returns \`{ description, source }\` where \`description\` is a text rendering of the UI tree \u2014 one
+line per element with its role, label/value/id, interactivity flags, and frame. Frame coordinates
+are normalized [0,1] fractions of the screen width/height (not pixels) \u2014 the same space as
+gesture-tap / gesture-swipe / gesture-pinch.
 
-Use frame.x + frame.width/2 as the tap X coordinate, frame.y + frame.height/2 as tap Y.
+To tap an element use the centre of its frame: \`tap_x = frame.x + frame.width / 2\`,
+\`tap_y = frame.y + frame.height / 2\`. The same formula appears in the response header so it
+can be applied to a line in isolation.
 
 For app-scoped inspection with full UIKit properties (accessibilityIdentifier, viewClassName),
 use native-describe-screen with an explicit bundleId instead (iOS only).
@@ -49122,11 +49352,11 @@ For React Native apps, debugger-component-tree returns React component names wit
       capability: capability16,
       ios: {
         requires: iosRequires,
-        handler: (_services, params, device) => describeIos(registry, device, params)
+        handler: async (_services, params, device) => withDescription(await describeIos(registry, device, params))
       },
       android: {
         requires: androidRequires,
-        handler: (_services, params) => describeAndroid(params.udid, params.bundleId)
+        handler: async (_services, params) => withDescription(await describeAndroid(params.udid, params.bundleId))
       }
     })
   };
@@ -54757,13 +54987,13 @@ var zodSchema52 = external_exports.object({
     "Absolute path to the project root directory (the directory that contains or should contain `.argent/flows/`). The flow file is created at `<project_root>/.argent/flows/<name>.yaml`."
   ),
   executionPrerequisite: external_exports.string().describe(
-    'Describes the required app/simulator state before running this flow (e.g. "App on home screen after a fresh reload", "Settings app open on General page")'
+    'Describes the required app/device state before running this flow (e.g. "App on home screen after a fresh reload", "Settings app open on General page")'
   )
 });
 var flowStartRecordingTool = {
   id: "flow-start-recording",
   description: `Start recording a new flow. Creates a .yaml file in the .argent/flows/ directory.
-Use when you want to capture a reusable sequence of simulator interactions for later replay.
+Use when you want to capture a reusable sequence of device interactions for later replay.
 Returns { message, flowFile } and optionally { previousFlow } if a prior recording was abandoned.
 Fails if the .argent/flows/ directory cannot be created or the flow file cannot be written.
 
@@ -54911,7 +55141,7 @@ function createRunFlowTool(registry) {
 Each step is executed in order: tool calls are dispatched through the registry,
 echo steps print a message. A tool step may carry \`delayMs: <ms>\` to sleep
 that long before the step runs. Returns the result of every step, including images.
-Use when you want to replay a recorded flow or run a scripted sequence of simulator actions.
+Use when you want to replay a recorded flow or run a scripted sequence of device actions.
 Fails if the flow file does not exist or a step tool raises an error (execution stops at that step).
 
 If the flow has an execution prerequisite and prerequisiteAcknowledged is not
@@ -55470,40 +55700,41 @@ async function getBootedUdids() {
   }
   return udids;
 }
-async function initSimulator(registry, watchedUdids, udid) {
-  watchedUdids.add(udid);
+async function initUdid(registry, udid, trackedServices) {
+  const ndRef = nativeDevtoolsRef({ id: udid, platform: "ios", kind: "simulator" });
   try {
-    const ndRef = nativeDevtoolsRef({ id: udid, platform: "ios", kind: "simulator" });
-    await registry.resolveService(ndRef.urn, ndRef.options);
-  } catch (err) {
-    watchedUdids.delete(udid);
-    process.stderr.write(
-      `[simulator-watcher] initSimulator failed for ${udid}: ${err instanceof Error ? err.message : err}
-`
-    );
+    const service = await registry.resolveService(ndRef.urn, ndRef.options);
+    trackedServices.set(udid, service);
+  } catch {
   }
 }
 function startSimulatorWatcher(registry) {
-  const watchedUdids = /* @__PURE__ */ new Set();
-  async function poll(awaitInit) {
+  const trackedServices = /* @__PURE__ */ new Map();
+  async function poll(shouldBlockUntilSettled) {
     let booted;
     try {
       booted = await getBootedUdids();
     } catch {
       return;
     }
-    const newUdids = [...booted].filter((udid) => !watchedUdids.has(udid));
-    if (awaitInit) {
-      await Promise.all(newUdids.map((udid) => initSimulator(registry, watchedUdids, udid)));
-    } else {
-      newUdids.forEach((udid) => {
-        initSimulator(registry, watchedUdids, udid).catch(() => {
-        });
-      });
+    const newUdids = [...booted].filter((udid) => !trackedServices.has(udid));
+    const pendingAttempts = newUdids.map(
+      (udid) => initUdid(registry, udid, trackedServices)
+    );
+    for (const [udid, service] of trackedServices) {
+      if (!booted.has(udid)) continue;
+      const failure = service.getInitFailure();
+      if (failure && !failure.givenUp) {
+        pendingAttempts.push(service.ensureEnvReady().catch(() => {
+        }));
+      }
     }
-    for (const udid of watchedUdids) {
+    if (shouldBlockUntilSettled) await Promise.all(pendingAttempts);
+    else pendingAttempts.forEach((p) => p.catch(() => {
+    }));
+    for (const udid of [...trackedServices.keys()]) {
       if (!booted.has(udid)) {
-        watchedUdids.delete(udid);
+        trackedServices.delete(udid);
         registry.disposeService(`${NATIVE_DEVTOOLS_NAMESPACE}:${udid}`).catch(() => {
         });
       }