@swmansion/argent 0.16.1-next.11 → 0.16.1-next.3

package/dist/cli-cmds.mjs

@@ -6226,7 +6226,6 @@ var FAILURE_CODES = {
   NATIVE_DEVTOOLS_RPC_TIMEOUT: "NATIVE_DEVTOOLS_RPC_TIMEOUT",
   NATIVE_DEVTOOLS_RPC_ERROR: "NATIVE_DEVTOOLS_RPC_ERROR",
   NATIVE_DEVTOOLS_SERVICE_DISPOSED: "NATIVE_DEVTOOLS_SERVICE_DISPOSED",
-  NATIVE_DEVTOOLS_SOCKET_BIND_FAILED: "NATIVE_DEVTOOLS_SOCKET_BIND_FAILED",
   NATIVE_TARGET_NO_CONNECTED_APPS: "NATIVE_TARGET_NO_CONNECTED_APPS",
   NATIVE_TARGET_SINGLE_APP_NOT_FOREGROUND: "NATIVE_TARGET_SINGLE_APP_NOT_FOREGROUND",
   NATIVE_TARGET_MULTIPLE_APPS_AMBIGUOUS: "NATIVE_TARGET_MULTIPLE_APPS_AMBIGUOUS",
@@ -8424,11 +8423,6 @@ var STATUS_GLYPH = {
   error: "\u2717",
   skip: "\xB7"
 };
-var MAX_RENDER_DEPTH = 20;
-function stepIndent(depth) {
-  if (typeof depth !== "number" || !Number.isInteger(depth) || depth <= 0) return "";
-  return "  ".repeat(Math.min(depth, MAX_RENDER_DEPTH));
-}
 function printHelp() {
   console.log(`Usage: argent flow <subcommand> [options]
 
@@ -8497,12 +8491,11 @@ function parseRunArgs(argv) {
 }
 function renderEchoLine(s) {
   if (!s.message) return void 0;
-  const indent = stepIndent(s.depth);
   if (s.status === "skip") {
     const reason = s.reason ? ` \u2014 ${s.reason}` : "";
-    return `  ${STATUS_GLYPH.skip} ${indent}\u203A ${s.message}${reason}`;
+    return `  ${STATUS_GLYPH.skip} \u203A ${s.message}${reason}`;
   }
-  return `  ${indent}\u203A ${s.message}`;
+  return `  \u203A ${s.message}`;
 }
 function renderStepLine(s, n2, topFlow) {
   const where = s.flow && s.flow !== topFlow ? ` [${s.flow}]` : "";
@@ -8510,10 +8503,7 @@ function renderStepLine(s, n2, topFlow) {
   const label = what ? `${s.kind} ${what}` : s.kind;
   const reason = s.reason ? ` \u2014 ${s.reason}` : "";
   const glyph = s.status === "pass" && s.warning ? "\u26A0" : STATUS_GLYPH[s.status];
-  return `  ${glyph} ${String(n2).padStart(2)} ${stepIndent(s.depth)}${label}${where}${reason}`;
-}
-function renderUnderStepLine(s, n2, text2) {
-  return `${" ".repeat(5 + Math.max(2, String(n2).length))}${stepIndent(s.depth)}${text2}`;
+  return `  ${glyph} ${String(n2).padStart(2)} ${label}${where}${reason}`;
 }
 function renderSummary(report, opts = {}) {
   const warnings = report.steps.filter((s) => s.warning).length;
@@ -8600,10 +8590,10 @@ function renderReport(report) {
     }
     n2++;
     lines.push(renderStepLine(s, n2, report.flow));
-    if (s.warning) lines.push(renderUnderStepLine(s, n2, `\u26A0 ${s.warning}`));
+    if (s.warning) lines.push(`       \u26A0 ${s.warning}`);
     if (s.artifacts && typeof s.artifacts === "object") {
       for (const [k, v] of Object.entries(s.artifacts)) {
-        if (typeof v === "string") lines.push(renderUnderStepLine(s, n2, `${k}: ${v}`));
+        if (typeof v === "string") lines.push(`       ${k}: ${v}`);
       }
     }
   }
@@ -8678,7 +8668,7 @@ async function flow(argv, options) {
     }
     liveIndex++;
     console.log(renderStepLine(s, liveIndex, flowName));
-    if (s.warning) console.log(renderUnderStepLine(s, liveIndex, `\u26A0 ${s.warning}`));
+    if (s.warning) console.log(`       \u26A0 ${s.warning}`);
   };
   let report;
   try {

package/dist/installer.mjs

@@ -16120,7 +16120,6 @@ var FAILURE_CODES = {
   NATIVE_DEVTOOLS_RPC_TIMEOUT: "NATIVE_DEVTOOLS_RPC_TIMEOUT",
   NATIVE_DEVTOOLS_RPC_ERROR: "NATIVE_DEVTOOLS_RPC_ERROR",
   NATIVE_DEVTOOLS_SERVICE_DISPOSED: "NATIVE_DEVTOOLS_SERVICE_DISPOSED",
-  NATIVE_DEVTOOLS_SOCKET_BIND_FAILED: "NATIVE_DEVTOOLS_SOCKET_BIND_FAILED",
   NATIVE_TARGET_NO_CONNECTED_APPS: "NATIVE_TARGET_NO_CONNECTED_APPS",
   NATIVE_TARGET_SINGLE_APP_NOT_FOREGROUND: "NATIVE_TARGET_SINGLE_APP_NOT_FOREGROUND",
   NATIVE_TARGET_MULTIPLE_APPS_AMBIGUOUS: "NATIVE_TARGET_MULTIPLE_APPS_AMBIGUOUS",

package/dist/mcp-server.mjs

@@ -17652,7 +17652,6 @@ var FAILURE_CODES = {
   NATIVE_DEVTOOLS_RPC_TIMEOUT: "NATIVE_DEVTOOLS_RPC_TIMEOUT",
   NATIVE_DEVTOOLS_RPC_ERROR: "NATIVE_DEVTOOLS_RPC_ERROR",
   NATIVE_DEVTOOLS_SERVICE_DISPOSED: "NATIVE_DEVTOOLS_SERVICE_DISPOSED",
-  NATIVE_DEVTOOLS_SOCKET_BIND_FAILED: "NATIVE_DEVTOOLS_SOCKET_BIND_FAILED",
   NATIVE_TARGET_NO_CONNECTED_APPS: "NATIVE_TARGET_NO_CONNECTED_APPS",
   NATIVE_TARGET_SINGLE_APP_NOT_FOREGROUND: "NATIVE_TARGET_SINGLE_APP_NOT_FOREGROUND",
   NATIVE_TARGET_MULTIPLE_APPS_AMBIGUOUS: "NATIVE_TARGET_MULTIPLE_APPS_AMBIGUOUS",
@@ -18897,11 +18896,6 @@ var STATUS_GLYPH = {
   error: "\u2717",
   skip: "\xB7"
 };
-var MAX_RENDER_DEPTH = 20;
-function stepIndent(depth) {
-  if (typeof depth !== "number" || !Number.isInteger(depth) || depth <= 0) return "";
-  return "  ".repeat(Math.min(depth, MAX_RENDER_DEPTH));
-}
 function stepLabel(step) {
   if (step.kind === "echo") return step.message ?? "";
   if (step.kind === "run") return `run ${step.flow ?? ""}`.trim();
@@ -18925,15 +18919,12 @@ async function flowRunToMcpContent(result, ctx) {
     const reason = step.reason ?? step.error;
     const suffix = reason ? ` \u2014 ${reason}` : "";
     const warning = step.warning ? ` \u26A0 ${step.warning}` : "";
-    blocks.push({
-      type: "text",
-      text: `[${num}] ${glyph}${stepIndent(step.depth)}${stepLabel(step)}${suffix}${warning}`
-    });
+    blocks.push({ type: "text", text: `[${num}] ${glyph}${stepLabel(step)}${suffix}${warning}` });
     if (step.result !== void 0) {
       blocks.push(...await toMcpContent(step.result, step.outputHint, ctx, step.args));
     }
     if (isRecord(step.artifacts)) {
-      blocks.push(...await stepArtifactBlocks(step.artifacts, step.status, ctx, step.depth));
+      blocks.push(...await stepArtifactBlocks(step.artifacts, step.status, ctx));
     }
   }
   if (result.ok !== void 0) {
@@ -18946,7 +18937,7 @@ async function flowRunToMcpContent(result, ctx) {
   }
   return blocks;
 }
-async function stepArtifactBlocks(artifacts, status, ctx, depth) {
+async function stepArtifactBlocks(artifacts, status, ctx) {
   const failed = status === "fail" || status === "error";
   const entries = [];
   let diffImage;
@@ -18962,8 +18953,7 @@ async function stepArtifactBlocks(artifacts, status, ctx, depth) {
       entries.push([k, v]);
     }
   }
-  const indent = stepIndent(depth);
-  const blocks = entries.length > 0 ? [{ type: "text", text: entries.map(([k, v]) => `  ${indent}${k}: ${v}`).join("\n") }] : [];
+  const blocks = entries.length > 0 ? [{ type: "text", text: entries.map(([k, v]) => `  ${k}: ${v}`).join("\n") }] : [];
   if (diffImage) blocks.push(diffImage);
   return blocks;
 }

package/dist/tool-server.cjs

@@ -293,7 +293,6 @@ var init_failure_codes = __esm({
       NATIVE_DEVTOOLS_RPC_TIMEOUT: "NATIVE_DEVTOOLS_RPC_TIMEOUT",
       NATIVE_DEVTOOLS_RPC_ERROR: "NATIVE_DEVTOOLS_RPC_ERROR",
       NATIVE_DEVTOOLS_SERVICE_DISPOSED: "NATIVE_DEVTOOLS_SERVICE_DISPOSED",
-      NATIVE_DEVTOOLS_SOCKET_BIND_FAILED: "NATIVE_DEVTOOLS_SOCKET_BIND_FAILED",
       NATIVE_TARGET_NO_CONNECTED_APPS: "NATIVE_TARGET_NO_CONNECTED_APPS",
       NATIVE_TARGET_SINGLE_APP_NOT_FOREGROUND: "NATIVE_TARGET_SINGLE_APP_NOT_FOREGROUND",
       NATIVE_TARGET_MULTIPLE_APPS_AMBIGUOUS: "NATIVE_TARGET_MULTIPLE_APPS_AMBIGUOUS",
@@ -105218,7 +105217,7 @@ async function shutdown(timeoutMs = SHORT_FLUSH_TIMEOUT_MS) {
 // ../tool-server/src/http.ts
 var import_express3 = __toESM(require_express2());
 var import_bytes2 = __toESM(require_bytes());
-var import_node_fs11 = require("node:fs");
+var import_node_fs10 = require("node:fs");
 var import_promises9 = require("node:fs/promises");
 var import_node_os8 = require("node:os");
 var import_node_path9 = require("node:path");
@@ -105269,7 +105268,7 @@ init_android_binary();
 // ../tool-server/src/utils/vega-cli.ts
 var import_node_child_process4 = require("node:child_process");
 var import_node_util3 = require("node:util");
-var import_node_fs5 = require("node:fs");
+var import_node_fs4 = require("node:fs");
 var import_promises3 = require("node:fs/promises");
 var import_node_os3 = require("node:os");
 var import_node_path3 = require("node:path");
@@ -105279,9 +105278,7 @@ init_subprocess_error();
 // ../tool-server/src/utils/vega-process.ts
 var import_node_child_process3 = require("node:child_process");
 var import_node_util2 = require("node:util");
-var import_node_fs4 = require("node:fs");
 var execFileAsync2 = (0, import_node_util2.promisify)(import_node_child_process3.execFile);
-var PS_BIN = ["/bin/ps", "/usr/bin/ps"].find((p) => (0, import_node_fs4.existsSync)(p)) ?? "ps";
 var PS_ARGS = ["-A", "-ww", "-o", "command="];
 var PS_ARGS_WITH_PID = ["-A", "-ww", "-o", "pid=,command="];
 var VVD_PROCESS_RE = /(?:^|\/)(?:vega|kepler)-virtual-device(?:\s|$)/;
@@ -105315,7 +105312,7 @@ function parseVvdPids(psOutput) {
 }
 async function listRunningVvdConsolePorts() {
   try {
-    const { stdout } = await execFileAsync2(PS_BIN, [...PS_ARGS], {
+    const { stdout } = await execFileAsync2("ps", [...PS_ARGS], {
       timeout: VVD_PS_PROBE_TIMEOUT_MS,
       maxBuffer: 16 * 1024 * 1024
     });
@@ -105330,7 +105327,7 @@ async function listRunningVvdConsolePorts() {
 }
 async function listRunningVvdPids() {
   try {
-    const { stdout } = await execFileAsync2(PS_BIN, [...PS_ARGS_WITH_PID], {
+    const { stdout } = await execFileAsync2("ps", [...PS_ARGS_WITH_PID], {
       timeout: 5e3,
       maxBuffer: 16 * 1024 * 1024
     });
@@ -105350,7 +105347,7 @@ var VEGA_BINARY_TTL_MS = 6e4;
 var cachedVegaBinary;
 async function isExecutable(p) {
   try {
-    await (0, import_promises3.access)(p, import_node_fs5.constants.X_OK);
+    await (0, import_promises3.access)(p, import_node_fs4.constants.X_OK);
     return true;
   } catch {
     return false;
@@ -105413,15 +105410,10 @@ async function reapVegaGroup(child) {
   }
 }
 async function collectDescendantPids(rootPid) {
-  let stdout;
-  try {
-    ({ stdout } = await execFileAsync3(PS_BIN, ["-A", "-o", "pid=,ppid="], {
-      timeout: 1500,
-      maxBuffer: 16 * 1024 * 1024
-    }));
-  } catch {
-    return [];
-  }
+  const { stdout } = await execFileAsync3("ps", ["-A", "-o", "pid=,ppid="], {
+    timeout: 1500,
+    maxBuffer: 16 * 1024 * 1024
+  });
   const childrenByParent = /* @__PURE__ */ new Map();
   for (const line of stdout.split("\n")) {
     const m = line.trim().match(/^(\d+)\s+(\d+)$/);
@@ -105447,15 +105439,10 @@ async function collectDescendantPids(rootPid) {
   return descendants;
 }
 async function pgidMembers(pgid) {
-  let stdout;
-  try {
-    ({ stdout } = await execFileAsync3(PS_BIN, ["-A", "-o", "pid=,pgid="], {
-      timeout: 1500,
-      maxBuffer: 16 * 1024 * 1024
-    }));
-  } catch {
-    return [];
-  }
+  const { stdout } = await execFileAsync3("ps", ["-A", "-o", "pid=,pgid="], {
+    timeout: 1500,
+    maxBuffer: 16 * 1024 * 1024
+  });
   const members = [];
   for (const line of stdout.split("\n")) {
     const m = line.trim().match(/^(\d+)\s+(\d+)$/);
@@ -105480,7 +105467,7 @@ async function reapLingeringGroupMembers(pid) {
   } catch {
   }
 }
-function resolveSpawnCwd(getCwd = () => process.cwd(), dirExists = import_node_fs5.existsSync, fallback = (0, import_node_os3.tmpdir)()) {
+function resolveSpawnCwd(getCwd = () => process.cwd(), dirExists = import_node_fs4.existsSync, fallback = (0, import_node_os3.tmpdir)()) {
   try {
     const cwd = getCwd();
     if (dirExists(cwd)) return cwd;
@@ -105771,7 +105758,7 @@ function toSimulatorNetworkError(toolLabel, err, apiUrl, fallbackHint) {
 }
 
 // ../tool-server/src/utils/update-checker.ts
-var import_node_fs6 = __toESM(require("node:fs"));
+var import_node_fs5 = __toESM(require("node:fs"));
 var import_node_os4 = __toESM(require("node:os"));
 var import_node_path4 = __toESM(require("node:path"));
 var import_semver = __toESM(require_semver2());
@@ -105789,7 +105776,7 @@ function getSuppressionFilePath() {
 }
 function loadSuppressUntil() {
   try {
-    const raw = import_node_fs6.default.readFileSync(getSuppressionFilePath(), "utf8");
+    const raw = import_node_fs5.default.readFileSync(getSuppressionFilePath(), "utf8");
     const parsed = JSON.parse(raw);
     const value = parsed.suppressUntil;
     return typeof value === "number" && Number.isFinite(value) ? value : 0;
@@ -105799,8 +105786,8 @@ function loadSuppressUntil() {
 }
 function persistSuppressUntil(value) {
   const filePath = getSuppressionFilePath();
-  import_node_fs6.default.mkdirSync(import_node_path4.default.dirname(filePath), { recursive: true });
-  import_node_fs6.default.writeFileSync(filePath, JSON.stringify({ suppressUntil: value }));
+  import_node_fs5.default.mkdirSync(import_node_path4.default.dirname(filePath), { recursive: true });
+  import_node_fs5.default.writeFileSync(filePath, JSON.stringify({ suppressUntil: value }));
 }
 var state2 = {
   updateAvailable: false,
@@ -105892,7 +105879,7 @@ ACTION REQUIRED: Save a note (via TODO, task list) that an Argent update to v${l
 }
 
 // ../tool-server/src/preview.ts
-var import_node_fs9 = __toESM(require("node:fs"));
+var import_node_fs8 = __toESM(require("node:fs"));
 var import_node_os6 = __toESM(require("node:os"));
 var import_node_path6 = __toESM(require("node:path"));
 var import_express = __toESM(require_express2());
@@ -105917,7 +105904,6 @@ var import_node_util8 = require("node:util");
 
 // ../tool-server/src/utils/simctl-config.ts
 var SIMCTL_SPAWN_TIMEOUT_MS = 1e4;
-var SIMCTL_KILL_SIGNAL = "SIGKILL";
 
 // ../tool-server/src/utils/ios-devices.ts
 var import_node_child_process6 = require("node:child_process");
@@ -105926,8 +105912,7 @@ var execFileAsync5 = (0, import_node_util5.promisify)(import_node_child_process6
 async function listIosSimulators() {
   try {
     const { stdout } = await execFileAsync5("xcrun", ["simctl", "list", "devices", "--json"], {
-      timeout: 1e4,
-      killSignal: SIMCTL_KILL_SIGNAL
+      timeout: 1e4
     });
     const data = JSON.parse(stdout);
     const out = [];
@@ -105989,7 +105974,7 @@ async function ensureAutomationEnabled(udid) {
       "-bool",
       "true"
     ],
-    { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
+    { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
   );
 }
 async function isEntitlementBypassActive(udid) {
@@ -106004,7 +105989,7 @@ async function isEntitlementBypassActive(udid) {
       "com.apple.Accessibility",
       "IgnoreAXServerEntitlements"
     ],
-    { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
+    { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
   ).then(({ stdout }) => stdout.trim() === "1").catch(() => false);
 }
 function accessibilityPlistPath(udid) {
@@ -106239,7 +106224,7 @@ async function ensureAccessibilityEnabled(udid) {
           "-bool",
           "true"
         ],
-        { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
+        { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
       )
     )
   );
@@ -106249,7 +106234,7 @@ async function setupNativeDevtoolsEnvLocal(udid, endpoint) {
   const result = await execFileAsync8(
     "xcrun",
     ["simctl", "spawn", udid, "launchctl", "getenv", "DYLD_INSERT_LIBRARIES"],
-    { encoding: "utf8", timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
+    { encoding: "utf8", timeout: SIMCTL_SPAWN_TIMEOUT_MS }
   ).catch((e) => ({ stdout: e.stdout ?? "" }));
   const existing = (result.stdout ?? "").trim();
   const updated = buildDyldInsertLibraries(existing, bootstrapPath);
@@ -106257,7 +106242,7 @@ async function setupNativeDevtoolsEnvLocal(udid, endpoint) {
     await execFileAsync8(
       "xcrun",
       ["simctl", "spawn", udid, "launchctl", "setenv", "DYLD_INSERT_LIBRARIES", updated],
-      { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
+      { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
     );
   }
   if (endpoint.transport === "tcp") {
@@ -106275,7 +106260,7 @@ async function setupNativeDevtoolsEnvLocal(udid, endpoint) {
         "NATIVE_DEVTOOLS_IOS_CDP_PORT",
         String(endpoint.port)
       ],
-      { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
+      { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
     );
   } else {
     await execFileAsync8(
@@ -106289,7 +106274,7 @@ async function setupNativeDevtoolsEnvLocal(udid, endpoint) {
         "NATIVE_DEVTOOLS_IOS_CDP_SOCKET",
         endpoint.socketPath
       ],
-      { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
+      { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
     );
   }
   await ensureAccessibilityEnabled(udid);
@@ -106319,9 +106304,7 @@ function parseUIKitApplicationBundleIds(stdout) {
 }
 async function listRunningUIKitApplicationBundleIds(udid) {
   const { stdout } = await execFileAsync8("xcrun", ["simctl", "spawn", udid, "launchctl", "list"], {
-    encoding: "utf8",
-    timeout: SIMCTL_SPAWN_TIMEOUT_MS,
-    killSignal: SIMCTL_KILL_SIGNAL
+    encoding: "utf8"
   });
   return parseUIKitApplicationBundleIds(stdout);
 }
@@ -115939,7 +115922,7 @@ init_src();
 
 // ../tool-server/src/utils/vega-sdk.ts
 var import_promises4 = require("node:fs/promises");
-var import_node_fs7 = require("node:fs");
+var import_node_fs6 = require("node:fs");
 var import_node_os5 = require("node:os");
 var import_node_path5 = require("node:path");
 var import_semver2 = __toESM(require_semver2());
@@ -115962,7 +115945,7 @@ function sdkComponentRoots(config2) {
   return Array.from(new Set(roots));
 }
 async function resolveVersion(channelDir, preferred) {
-  if (preferred && (0, import_node_fs7.existsSync)((0, import_node_path5.join)(channelDir, preferred))) return preferred;
+  if (preferred && (0, import_node_fs6.existsSync)((0, import_node_path5.join)(channelDir, preferred))) return preferred;
   try {
     const versions = (await (0, import_promises4.readdir)(channelDir)).filter((e) => import_semver2.default.valid(e)).sort(import_semver2.default.rcompare);
     return versions[0] ?? null;
@@ -115980,7 +115963,7 @@ async function resolveVegaSdkImagesDir() {
     const version4 = await resolveVersion(channelDir, preferred);
     if (!version4) continue;
     const imagesDir = (0, import_node_path5.join)(channelDir, version4, "vvd", "images");
-    if ((0, import_node_fs7.existsSync)(imagesDir)) return imagesDir;
+    if ((0, import_node_fs6.existsSync)(imagesDir)) return imagesDir;
   }
   return null;
 }
@@ -116811,43 +116794,6 @@ function nativeDevtoolsRef(device, { transport = "unix" } = {}) {
 function getNativeDevtoolsSocketPath(udid) {
   return `/tmp/argent-nd-${udid.slice(0, 8)}.sock`;
 }
-function bindNativeDevtoolsUnixSocket(server, socketPath) {
-  return new Promise((resolve7, reject) => {
-    let retried = false;
-    const onListening = () => {
-      server.off("error", onError);
-      resolve7();
-    };
-    const onError = (err) => {
-      if ((err.code === "EADDRINUSE" || err.code === "EEXIST") && !retried) {
-        retried = true;
-        try {
-          fs13.unlinkSync(socketPath);
-        } catch {
-        }
-        server.listen(socketPath);
-        return;
-      }
-      server.off("listening", onListening);
-      server.off("error", onError);
-      server.close();
-      reject(
-        new FailureError(
-          `native-devtools failed to bind unix socket ${socketPath}: ${err.code ?? err.message}`,
-          {
-            error_code: FAILURE_CODES.NATIVE_DEVTOOLS_SOCKET_BIND_FAILED,
-            failure_stage: "native_devtools_socket_bind",
-            failure_area: "tool_server",
-            error_kind: "network"
-          }
-        )
-      );
-    };
-    server.on("error", onError);
-    server.once("listening", onListening);
-    server.listen(socketPath);
-  });
-}
 var nativeDevtoolsBlueprint = {
   namespace: NATIVE_DEVTOOLS_NAMESPACE,
   getURN(device) {
@@ -117058,7 +117004,7 @@ var nativeDevtoolsBlueprint = {
       });
       await host.startProxy(udid, endpoint.port);
     } else {
-      await bindNativeDevtoolsUnixSocket(server, socketPath);
+      server.listen(socketPath);
     }
     await ensureEnvReady().catch(() => {
     });
@@ -117955,7 +117901,7 @@ var TraceProcessorUnavailableError = class _TraceProcessorUnavailableError exten
 };
 
 // ../native-devtools-android/src/wasm-trace-processor.ts
-var import_node_fs8 = require("node:fs");
+var import_node_fs7 = require("node:fs");
 var import_promises5 = require("node:fs/promises");
 var path13 = __toESM(require("node:path"));
 var import_node_url2 = require("node:url");
@@ -117970,7 +117916,7 @@ function engineGlobals() {
 function resolveTraceProcessorAssets() {
   const dir = path13.join(__dirname, "..", "assets", "trace-processor");
   const wasmOverride = process.env.ARGENT_TRACE_PROCESSOR_WASM;
-  if (wasmOverride && !(0, import_node_fs8.existsSync)(wasmOverride)) {
+  if (wasmOverride && !(0, import_node_fs7.existsSync)(wasmOverride)) {
     throw new TraceProcessorUnavailableError("wasm_path_invalid", { path: wasmOverride });
   }
   return {
@@ -118098,8 +118044,8 @@ async function createEngine() {
     setupWorkerScope(dir);
     silenceDecoderWarning();
     const g = engineGlobals();
-    g.__TP_WASM_BYTES = new Uint8Array((0, import_node_fs8.readFileSync)(wasmPath));
-    const src = patchGlueForNode((0, import_node_fs8.readFileSync)(gluePath, "utf8"));
+    g.__TP_WASM_BYTES = new Uint8Array((0, import_node_fs7.readFileSync)(wasmPath));
+    const src = patchGlueForNode((0, import_node_fs7.readFileSync)(gluePath, "utf8"));
     import_node_vm.default.runInThisContext(src, { filename: "engine_bundle.node.patched.js" });
     const bridge = g.__TP_bridge;
     if (!bridge) throw new Error("patched glue did not expose globalThis.__TP_bridge");
@@ -118784,7 +118730,7 @@ function findUiFile(name) {
     import_node_path6.default.resolve(__dirname, "..", "..", "ui", name)
   ];
   for (const p of candidates) {
-    if (import_node_fs9.default.existsSync(p)) return p;
+    if (import_node_fs8.default.existsSync(p)) return p;
   }
   return null;
 }
@@ -119107,7 +119053,7 @@ data: ${JSON.stringify(data)}
     const roots = /* @__PURE__ */ new Set();
     for (const r of [import_node_os6.default.tmpdir(), process.cwd(), "/tmp"]) {
       try {
-        roots.add(import_node_fs9.default.realpathSync(r));
+        roots.add(import_node_fs8.default.realpathSync(r));
       } catch {
       }
     }
@@ -119126,8 +119072,8 @@ data: ${JSON.stringify(data)}
     let real;
     let size;
     try {
-      real = import_node_fs9.default.realpathSync(src);
-      const st = import_node_fs9.default.statSync(real);
+      real = import_node_fs8.default.realpathSync(src);
+      const st = import_node_fs8.default.statSync(real);
       if (!st.isFile()) throw new Error("not a file");
       size = st.size;
     } catch {
@@ -119144,7 +119090,7 @@ data: ${JSON.stringify(data)}
     }
     res.set("Cache-Control", "no-store");
     res.type(mime);
-    import_node_fs9.default.createReadStream(real).on("error", () => {
+    import_node_fs8.default.createReadStream(real).on("error", () => {
       if (!res.headersSent) res.status(404).end();
     }).pipe(res);
   });
@@ -119196,7 +119142,7 @@ data: ${JSON.stringify(data)}
 }
 
 // ../tool-server/src/artifacts.ts
-var import_node_fs10 = require("node:fs");
+var import_node_fs9 = require("node:fs");
 var import_promises7 = require("node:fs/promises");
 var import_node_child_process15 = require("node:child_process");
 
@@ -119324,7 +119270,7 @@ function makeArtifactRoute(registry2) {
     res.setHeader("Content-Type", entry.mimeType);
     res.setHeader("Content-Disposition", `attachment; filename="${entry.filename}"`);
     if (entry.size > 0) res.setHeader("Content-Length", String(entry.size));
-    const stream = (0, import_node_fs10.createReadStream)(entry.path);
+    const stream = (0, import_node_fs9.createReadStream)(entry.path);
     stream.on("error", () => {
       if (!res.headersSent) res.status(500).json({ error: `Failed to read artifact "${id}"` });
       else res.destroy();
@@ -119991,7 +119937,7 @@ function createHttpApp(registry2, options) {
     }
     const id = (0, import_node_crypto6.randomUUID)();
     const tarPath = (0, import_node_path9.join)((0, import_node_os8.tmpdir)(), `argent-upload-${id}.tar.gz`);
-    const ws = (0, import_node_fs11.createWriteStream)(tarPath);
+    const ws = (0, import_node_fs10.createWriteStream)(tarPath);
     let received = 0;
     let released = false;
     const releaseInFlight = () => {
@@ -120329,15 +120275,15 @@ function createHttpApp(registry2, options) {
 
 // ../tool-server/src/event-log.ts
 var import_bunyan = __toESM(require_bunyan());
-var import_node_fs12 = require("node:fs");
+var import_node_fs11 = require("node:fs");
 var import_node_path10 = require("node:path");
 init_src();
 function createToolServerEventLog({
   filePath
 }) {
-  (0, import_node_fs12.mkdirSync)((0, import_node_path10.dirname)(filePath), { recursive: true });
-  (0, import_node_fs12.writeFileSync)(filePath, "");
-  const fileStream = (0, import_node_fs12.createWriteStream)(filePath, { flags: "a" });
+  (0, import_node_fs11.mkdirSync)((0, import_node_path10.dirname)(filePath), { recursive: true });
+  (0, import_node_fs11.writeFileSync)(filePath, "");
+  const fileStream = (0, import_node_fs11.createWriteStream)(filePath, { flags: "a" });
   let disposed = false;
   let disposePromise = null;
   let streamError = null;
@@ -121638,10 +121584,6 @@ var zodSchema2 = external_exports.object({
 var nativeDevtoolsStatusTool = {
   id: "native-devtools-status",
   capability: { apple: { simulator: true, device: true }, appleRemote: { simulator: true } },
-  // The "injectable is false" recovery sentence inlines NON_INJECTABLE_RECOVERY
-  // verbatim: the description must stay a plain literal so scripts/extract-tools.mjs
-  // can read it statically for the spidershield scan. The verbatim match is pinned
-  // by native-devtools-status.test.ts.
   description: `Check whether native devtools are connected to a specific app and whether the next launch is prepared for injection.
 Use when you need to verify native devtools readiness before calling native-full-hierarchy, native-describe-screen, or native-network-logs.
 
@@ -121654,7 +121596,7 @@ Returns { envSetup, appRunning, connected, requiresRestart, nextLaunchWillBeInje
 - injectable: whether native devtools can ever be injected into this app. Apple system apps (bundle ids under com.apple.) are platform binaries with library validation, so the dylib can never load into them.
 
 Call this before using app-scoped native hierarchy tools or native-network-logs.
-If injectable is false: this is a TERMINAL state \u2014 the app can never be injected. Do NOT restart/retry. Use the standard \`describe\` tool (its accessibility path reads the screen without injection) or \`screenshot\` (then interact by coordinate). Do not fall back to the native-devtools feature tools (native-describe-screen, native-find-views, native-full-hierarchy, native-network-logs, native-view-at-point, native-user-interactable-view-at-point) \u2014 they run the same injection precheck and fail with the same non-injectable error.
+If injectable is false: this is a TERMINAL state \u2014 the app can never be injected. Do NOT restart/retry. ${NON_INJECTABLE_RECOVERY}
 If appRunning is false and nextLaunchWillBeInjected is true: use launch-app normally.
 If requiresRestart is true: call restart-app, then proceed with the native feature.
 Returns { status: "init_failed", message, attempts } instead when the simulator's native-devtools environment failed to initialize.
@@ -122177,20 +122119,6 @@ function normalizeWsUrl(wsUrl, port) {
   return url2.toString();
 }
 
-// ../tool-server/src/utils/debugger/device-alias.ts
-var logicalIdToConnectId = /* @__PURE__ */ new Map();
-function rememberDeviceAlias(logicalDeviceId, connectDeviceId) {
-  if (!logicalDeviceId || logicalDeviceId === connectDeviceId) return;
-  logicalIdToConnectId.set(logicalDeviceId, connectDeviceId);
-}
-function canonicalDeviceId(deviceId) {
-  if (!deviceId) return deviceId;
-  return logicalIdToConnectId.get(deviceId) ?? deviceId;
-}
-function forgetDeviceAlias(logicalDeviceId) {
-  if (logicalDeviceId) logicalIdToConnectId.delete(logicalDeviceId);
-}
-
 // ../tool-server/src/utils/debugger/source-resolver.ts
 var fs18 = __toESM(require("node:fs/promises"));
 var path17 = __toESM(require("node:path"));
@@ -122609,7 +122537,6 @@ var jsRuntimeDebuggerBlueprint = {
       consoleEvents,
       consoleSocketUrl: consoleServer.url
     };
-    rememberDeviceAlias(api.logicalDeviceId, deviceId);
     const events = new TypedEventEmitter();
     cdp.events.on("disconnected", (error52) => {
       events.emit(
@@ -122625,7 +122552,6 @@ var jsRuntimeDebuggerBlueprint = {
     return {
       api,
       dispose: async () => {
-        forgetDeviceAlias(api.logicalDeviceId);
         await consoleServer.close();
         logWriter.close();
         await cdp.disconnect();
@@ -125788,14 +125714,6 @@ init_zod();
 var import_node_child_process24 = require("node:child_process");
 var import_node_util18 = require("node:util");
 init_src();
-
-// ../tool-server/src/tools/open-url/deep-link-note.ts
-function httpDeepLinkNote(url2) {
-  if (!/^https?:/i.test(url2)) return void 0;
-  return "This is a web URL \u2014 it opens the native app only if an app installed on this device is verified for the link's domain (iOS Universal Links / Android App Links); otherwise it opens in the browser. On iOS simulators it may open in Safari even when the owning app is installed. To reliably open an installed app, use its custom scheme (scheme://path) or launch-app with its bundle id.";
-}
-
-// ../tool-server/src/tools/open-url/platforms/ios.ts
 var execFileAsync18 = (0, import_node_util18.promisify)(import_node_child_process24.execFile);
 var iosImpl3 = {
   requires: ["xcrun"],
@@ -125815,7 +125733,7 @@ var iosImpl3 = {
         { cause: err instanceof Error ? err : new Error(String(err)) }
       );
     }
-    return { opened: true, url: params.url, note: httpDeepLinkNote(params.url) };
+    return { opened: true, url: params.url };
   }
 };
 
@@ -125839,7 +125757,7 @@ var androidImpl5 = {
         error_kind: "subprocess"
       });
     }
-    return { opened: true, url: params.url, note: httpDeepLinkNote(params.url) };
+    return { opened: true, url: params.url };
   }
 };
 
@@ -125848,7 +125766,7 @@ var iosRemoteImpl5 = {
   requires: ["sim-remote"],
   handler: async (_services, params) => {
     await simctlOpenUrl(params.udid, params.url);
-    return { opened: true, url: params.url, note: httpDeepLinkNote(params.url) };
+    return { opened: true, url: params.url };
   }
 };
 
@@ -125879,8 +125797,7 @@ var openUrlTool = {
   description: `Open a URL or URL scheme on the device.
 Use to navigate to a web page or deep-link into an app. On Chromium, this navigates the primary renderer to the given URL.
 Cross-platform schemes: https://, tel:, mailto:. iOS also: messages://, settings://, maps://. Android also: geo:, plus any app-specific deep link.
-Deep-linking caveat: an https:// link opens the native app only when an installed app is verified for the link's domain (iOS Universal Links / Android App Links) \u2014 otherwise it opens in the browser, and on iOS simulators it may open in Safari even when the owning app is installed. To reliably open an installed app, use its custom scheme (scheme://path) or launch-app with its bundle id.
-Returns { opened, url, note? }. note carries the deep-linking caveat when a web URL was opened on a native device. Fails if no app is registered to handle the URI (iOS/Android) or the renderer rejects the navigation (Chromium).`,
+Returns { opened, url }. Fails if no app is registered to handle the URI (iOS/Android) or the renderer rejects the navigation (Chromium).`,
   zodSchema: zodSchema14,
   capability: capability6,
   services: (params) => {
@@ -133937,19 +133854,18 @@ var RN_ONLY_TOOL_CAPABILITY = {
   android: { emulator: true, device: true, unknown: true }
 };
 function debuggerServiceRef(params) {
-  const deviceId = canonicalDeviceId(params.device_id);
-  if (deviceId && deviceId.startsWith(CHROMIUM_ID_PREFIX)) {
-    const device = resolveDevice(deviceId);
+  if (params.device_id && params.device_id.startsWith(CHROMIUM_ID_PREFIX)) {
+    const device = resolveDevice(params.device_id);
     return chromiumJsRuntimeDebuggerRef(device);
   }
-  return `JsRuntimeDebugger:${params.port}:${deviceId}`;
+  return `JsRuntimeDebugger:${params.port}:${params.device_id}`;
 }
 
 // ../tool-server/src/tools/debugger/debugger-connect.ts
 var zodSchema29 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port (ignored for Chromium \u2014 its CDP port is encoded in device_id)"),
   device_id: external_exports.string().describe(
-    "Device id from list-devices: iOS simulator UDID, Android serial, Vega serial (amazon-...), or Chromium device id (chromium-cdp-<port>). Pass this SAME id as device_id to every subsequent debugger-* call to pin them to this device. The returned logicalDeviceId is informational (Metro's own per-connection handle, absent on Vega); you do not switch to it \u2014 forwarding it still resolves here, but the list-devices id is the stable one."
+    "Device id: iOS simulator UDID, Android logicalDeviceId returned by Metro, Vega serial (amazon-...), or Chromium device id (chromium-cdp-<port>) from list-devices. When a logicalDeviceId is returned, forward it as device_id to all subsequent debugger-* calls to pin them to this device; when none is returned (Vega), keep passing the id you connected with."
   )
 });
 var debuggerConnectTool = {
@@ -133982,7 +133898,7 @@ init_zod();
 var zodSchema30 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port (ignored for Chromium)"),
   device_id: external_exports.string().describe(
-    "Device id from list-devices \u2014 the SAME id you passed to debugger-connect (iOS simulator UDID, Android serial, Vega serial, or Chromium device id). The logicalDeviceId debugger-connect returns also resolves here, but prefer the stable list-devices id."
+    "Device id from debugger-connect (iOS simulator UDID, Android logicalDeviceId, Vega serial, or Chromium device id)."
   )
 });
 var debuggerStatusTool = {
@@ -134017,7 +133933,7 @@ init_zod();
 var zodSchema31 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port (ignored for Chromium)"),
   device_id: external_exports.string().describe(
-    "Device id from list-devices \u2014 the SAME id you passed to debugger-connect (iOS simulator UDID, Android serial, Vega serial, or Chromium device id). The logicalDeviceId debugger-connect returns also resolves here, but prefer the stable list-devices id."
+    "Device id from debugger-connect (iOS simulator UDID, Android logicalDeviceId, Vega serial, or Chromium device id)."
   ),
   expression: external_exports.string().describe("JavaScript expression to evaluate in the app runtime")
 });
@@ -134048,7 +133964,7 @@ init_src();
 var zodSchema32 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port"),
   device_id: external_exports.string().describe(
-    "Device id from list-devices \u2014 the SAME id you passed to debugger-connect (iOS simulator UDID or Android serial)."
+    "Device logicalDeviceId from debugger-connect (iOS simulator UDID or Android logicalDeviceId)."
   )
 });
 var debuggerReloadMetroTool = {
@@ -134063,7 +133979,7 @@ Use when you want to apply code changes or reset JS state. Returns { reloaded, p
   // want that on Chromium later, it deserves its own tool.
   capability: RN_ONLY_TOOL_CAPABILITY,
   services: (params) => ({
-    debugger: `JsRuntimeDebugger:${params.port}:${canonicalDeviceId(params.device_id)}`
+    debugger: `JsRuntimeDebugger:${params.port}:${params.device_id}`
   }),
   async execute(services, _params) {
     const api = services.debugger;
@@ -134866,7 +134782,7 @@ function buildTextTree(data, opts) {
 var zodSchema33 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port"),
   device_id: external_exports.string().describe(
-    "Device id from list-devices \u2014 the SAME id you passed to debugger-connect (iOS simulator UDID or Android serial)."
+    "Device logicalDeviceId from debugger-connect (iOS simulator UDID or Android logicalDeviceId)."
   ),
   onScreenOnly: external_exports.boolean().default(true).describe(
     "When true (default), only components visible on screen are returned. Set to false to include all mounted components including those scrolled off-screen. Useful when you need to understand the full page structure."
@@ -134905,7 +134821,7 @@ Use when you need tap coordinates for a React Native UI element. Returns a compa
   // for DOM-tree discovery on Chromium.
   capability: RN_ONLY_TOOL_CAPABILITY,
   services: (params) => ({
-    debugger: `JsRuntimeDebugger:${params.port}:${canonicalDeviceId(params.device_id)}`
+    debugger: `JsRuntimeDebugger:${params.port}:${params.device_id}`
   }),
   async execute(services, params) {
     const api = services.debugger;
@@ -134933,7 +134849,7 @@ Use when you need tap coordinates for a React Native UI element. Returns a compa
     const deviceLine = [
       `device: ${api.deviceName}`,
       `app: ${api.appName}`,
-      ...api.logicalDeviceId ? [`logicalDeviceId: ${api.logicalDeviceId}`] : []
+      ...api.logicalDeviceId ? [`udid: ${api.logicalDeviceId}`] : []
     ].join(" | ");
     return `[${deviceLine}]
 ${tree}`;
@@ -135373,7 +135289,7 @@ function filterInspectItems(items, includeSkipped = false) {
 var zodSchema34 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port"),
   device_id: external_exports.string().describe(
-    "Device id from list-devices \u2014 the SAME id you passed to debugger-connect (iOS simulator UDID or Android serial)."
+    "Device logicalDeviceId from debugger-connect (iOS simulator UDID or Android logicalDeviceId)."
   ),
   x: external_exports.coerce.number().describe("Logical X coordinate on device screen"),
   y: external_exports.coerce.number().describe("Logical Y coordinate on device screen"),
@@ -135410,7 +135326,7 @@ Use when you need the source file and line for a component at a tap coordinate.
   // out of scope for this port.
   capability: RN_ONLY_TOOL_CAPABILITY,
   services: (params) => ({
-    debugger: `JsRuntimeDebugger:${params.port}:${canonicalDeviceId(params.device_id)}`
+    debugger: `JsRuntimeDebugger:${params.port}:${params.device_id}`
   }),
   async execute(services, params) {
     const api = services.debugger;
@@ -135507,7 +135423,7 @@ init_zod();
 var zodSchema35 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port (ignored for Chromium)"),
   device_id: external_exports.string().describe(
-    "Device id from list-devices \u2014 the SAME id you passed to debugger-connect (iOS simulator UDID, Android serial, Vega serial, or Chromium device id). The logicalDeviceId debugger-connect returns also resolves here, but prefer the stable list-devices id."
+    "Device id from debugger-connect (iOS simulator UDID, Android logicalDeviceId, Vega serial, or Chromium device id)."
   )
 });
 var debuggerLogRegistryTool = {
@@ -135595,9 +135511,7 @@ ${lines.join("\n")}`;
 }
 var zodSchema36 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port (RN only; ignored on Chromium)"),
-  device_id: external_exports.string().describe(
-    "Device id from list-devices (iOS simulator UDID or Android serial) \u2014 the same id used with debugger-connect."
-  ),
+  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.'
   )
@@ -135619,7 +135533,7 @@ Fails if the app is not connected (RN) or the device is not reachable (Chromium)
     if (device.platform === "chromium") {
       return { chromium: chromiumCdpRef(device) };
     }
-    return { inspector: `NetworkInspector:${params.port}:${canonicalDeviceId(params.device_id)}` };
+    return { inspector: `NetworkInspector:${params.port}:${params.device_id}` };
   },
   async execute(services, params) {
     if (resolveDevice(params.device_id).platform === "chromium") {
@@ -135683,9 +135597,7 @@ function redactHeaders(headers) {
 var MAX_BODY_SIZE = 1e3;
 var zodSchema37 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port"),
-  device_id: external_exports.string().describe(
-    "Device id from list-devices (iOS simulator UDID or Android serial) \u2014 the same id used with debugger-connect."
-  ),
+  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.")
 });
@@ -135704,7 +135616,7 @@ Returns an error message string if the requestId is not found \u2014 use view-ne
     if (device.platform === "chromium") {
       return { chromium: chromiumCdpRef(device) };
     }
-    return { inspector: `NetworkInspector:${params.port}:${canonicalDeviceId(params.device_id)}` };
+    return { inspector: `NetworkInspector:${params.port}:${params.device_id}` };
   },
   async execute(services, params) {
     if (resolveDevice(params.device_id).platform === "chromium") {
@@ -136263,7 +136175,7 @@ var NO_RENDERERS_ATTACHED_ERROR = "React DevTools hook is present but no React r
 var zodSchema40 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port"),
   device_id: external_exports.string().describe(
-    "Device id from list-devices \u2014 the SAME id you passed to debugger-connect (iOS simulator UDID or Android serial)."
+    "Device logicalDeviceId from debugger-connect (iOS simulator UDID or Android logicalDeviceId)."
   ),
   sample_interval_us: external_exports.coerce.number().int().positive().default(100).describe("CPU sampling interval in microseconds (default 100)"),
   force: external_exports.boolean().default(false).describe(
@@ -136294,9 +136206,8 @@ Fails if the Hermes runtime is not reachable or the Metro CDP connection cannot
     capability: RN_ONLY_TOOL_CAPABILITY,
     services: () => ({}),
     async execute(_services, params) {
-      const deviceId = canonicalDeviceId(params.device_id);
-      const jsdUrn = `${JS_RUNTIME_DEBUGGER_NAMESPACE}:${params.port}:${deviceId}`;
-      const psUrn = `${REACT_PROFILER_SESSION_NAMESPACE}:${params.port}:${deviceId}`;
+      const jsdUrn = `${JS_RUNTIME_DEBUGGER_NAMESPACE}:${params.port}:${params.device_id}`;
+      const psUrn = `${REACT_PROFILER_SESSION_NAMESPACE}:${params.port}:${params.device_id}`;
       const ignore = () => {
       };
       async function disposeAndWait() {
@@ -136563,7 +136474,7 @@ async function readCommitTree(path36) {
 var zodSchema41 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port"),
   device_id: external_exports.string().describe(
-    "Device id from list-devices \u2014 the SAME id you passed to debugger-connect (iOS simulator UDID or Android serial)."
+    "Device logicalDeviceId from debugger-connect (iOS simulator UDID or Android logicalDeviceId)."
   )
 });
 function normalizeChangeDescription(raw) {
@@ -136649,7 +136560,7 @@ Fails if no active profiling session exists or the CDP connection was lost durin
     capability: RN_ONLY_TOOL_CAPABILITY,
     services: () => ({}),
     async execute(_services, params) {
-      const psUrn = `${REACT_PROFILER_SESSION_NAMESPACE}:${params.port}:${canonicalDeviceId(params.device_id)}`;
+      const psUrn = `${REACT_PROFILER_SESSION_NAMESPACE}:${params.port}:${params.device_id}`;
       const snapshot = registry2.getSnapshot();
       const entry = snapshot.services.get(psUrn);
       if (!entry || entry.state !== "RUNNING" /* RUNNING */) {
@@ -139207,7 +139118,7 @@ var nativeProfilerSessionBlueprint = {
 var import_child_process4 = require("child_process");
 init_src();
 var import_fs9 = require("fs");
-var import_node_fs13 = require("node:fs");
+var import_node_fs12 = require("node:fs");
 var path22 = __toESM(require("path"));
 
 // ../tool-server/src/utils/ios-profiler/notify.ts
@@ -140856,7 +140767,7 @@ function resolveDefaultTemplatePath() {
     )
   ];
   for (const candidate of candidates) {
-    if ((0, import_node_fs13.existsSync)(candidate)) return candidate;
+    if ((0, import_node_fs12.existsSync)(candidate)) return candidate;
   }
   throw new FailureError(
     `Argent.tracetemplate not found. Looked in:
@@ -149179,11 +149090,7 @@ returns a notice with the prerequisite instead of running.`,
       };
       let aborted2;
       try {
-        await execSteps(state3, flow.steps, {
-          flow: params.name,
-          runStack: [params.name],
-          depth: 0
-        });
+        await execSteps(state3, flow.steps, params.name, [params.name]);
       } finally {
         aborted2 = state3.signal?.aborted === true;
         if (state3.pinned) await restoreStatusBar(device);
@@ -149318,13 +149225,7 @@ function stepTarget(step) {
       return void 0;
   }
 }
-function childScope(scope, overrides = {}) {
-  return { ...scope, ...overrides, depth: scope.depth + 1 };
-}
-function depthOf(scope) {
-  return scope.depth ? { depth: scope.depth } : {};
-}
-async function execSteps(state3, steps, scope) {
+async function execSteps(state3, steps, sourceFlow, runStack) {
   for (const step of steps) {
     const index = state3.reports.length;
     if (state3.stopped) {
@@ -149332,14 +149233,13 @@ async function execSteps(state3, steps, scope) {
         index,
         kind: step.kind,
         status: "skip",
-        flow: scope.flow,
+        flow: sourceFlow,
         target: stepTarget(step),
-        ...depthOf(scope),
         // Carry the echo's message so a skipped narration renders as a skip
         // line rather than vanishing — matching reportBlockSkipped.
         ...step.kind === "echo" ? { message: step.message } : {}
       });
-      if (step.kind === "when") reportBlockSkipped(state3, step.steps, childScope(scope));
+      if (step.kind === "when") reportBlockSkipped(state3, step.steps, sourceFlow);
       continue;
     }
     if (state3.signal?.aborted) {
@@ -149349,25 +149249,22 @@ async function execSteps(state3, steps, scope) {
         kind: step.kind,
         status: "skip",
         reason: "run aborted",
-        flow: scope.flow,
+        flow: sourceFlow,
         target: stepTarget(step),
-        ...depthOf(scope),
         ...step.kind === "echo" ? { message: step.message } : {}
       });
-      if (step.kind === "when") {
-        reportBlockSkipped(state3, step.steps, childScope(scope), "run aborted");
-      }
+      if (step.kind === "when") reportBlockSkipped(state3, step.steps, sourceFlow, "run aborted");
       continue;
     }
     if (step.kind === "run") {
-      await execRunStep(state3, step, scope);
+      await execRunStep(state3, step, runStack);
       continue;
     }
     if (step.kind === "when") {
-      await execWhenStep(state3, step, scope);
+      await execWhenStep(state3, step, sourceFlow, runStack);
       continue;
     }
-    const report = await execLeafStep(state3, step, index, scope);
+    const report = await execLeafStep(state3, step, index, sourceFlow);
     pushReport(state3, report);
     if (report.status === "fail" || report.status === "error") state3.stopped = true;
   }
@@ -149376,7 +149273,7 @@ function describeWhenCondition(cond) {
   if (cond.kind === "platform") return `platform ${cond.platform}`;
   return conditionLabel(cond, describeSelector);
 }
-function reportBlockSkipped(state3, steps, scope, reason) {
+function reportBlockSkipped(state3, steps, sourceFlow, reason) {
   for (const step of steps) {
     pushReport(state3, {
       index: state3.reports.length,
@@ -149386,20 +149283,17 @@ function reportBlockSkipped(state3, steps, scope, reason) {
       // A `run:` line is attributed to the fragment it names, matching the
       // executed marker in execRunStep; everything else belongs to the
       // enclosing flow.
-      flow: step.kind === "run" ? step.flow : scope.flow,
+      flow: step.kind === "run" ? step.flow : sourceFlow,
       target: stepTarget(step),
-      ...depthOf(scope),
       ...step.kind === "echo" ? { message: step.message } : {}
     });
-    if (step.kind === "when") reportBlockSkipped(state3, step.steps, childScope(scope), reason);
+    if (step.kind === "when") reportBlockSkipped(state3, step.steps, sourceFlow, reason);
   }
 }
-async function execWhenStep(state3, step, scope) {
+async function execWhenStep(state3, step, sourceFlow, runStack) {
   const index = state3.reports.length;
   const label = describeWhenCondition(step.condition);
   const target = stepTarget(step);
-  const marker = { index, kind: "when", flow: scope.flow, target, ...depthOf(scope) };
-  const inner = childScope(scope);
   let met;
   if (step.condition.kind === "platform") {
     const platform = state3.device.platform === "ios-remote" ? "ios" : state3.device.platform;
@@ -149407,18 +149301,28 @@ async function execWhenStep(state3, step, scope) {
   } else {
     const probe3 = await probeWhenCondition(state3, step.condition);
     if (probe3.aborted) {
-      pushReport(state3, { ...marker, status: "skip", reason: "run aborted" });
-      reportBlockSkipped(state3, step.steps, inner, "run aborted");
+      pushReport(state3, {
+        index,
+        kind: "when",
+        status: "skip",
+        reason: "run aborted",
+        flow: sourceFlow,
+        target
+      });
+      reportBlockSkipped(state3, step.steps, sourceFlow, "run aborted");
       return;
     }
     if (!probe3.ok && probe3.indeterminate) {
       pushReport(state3, {
-        ...marker,
+        index,
+        kind: "when",
         status: "error",
-        reason: `could not evaluate when guard (${label}): ${probe3.reason}`
+        reason: `could not evaluate when guard (${label}): ${probe3.reason}`,
+        flow: sourceFlow,
+        target
       });
       state3.stopped = true;
-      reportBlockSkipped(state3, step.steps, inner, "when guard errored");
+      reportBlockSkipped(state3, step.steps, sourceFlow, "when guard errored");
       return;
     }
     met = probe3.ok;
@@ -149426,34 +149330,37 @@ async function execWhenStep(state3, step, scope) {
   if (!met) {
     const n = step.steps.length;
     pushReport(state3, {
-      ...marker,
+      index,
+      kind: "when",
       status: "skip",
-      reason: `condition not met (${label}) \u2014 block skipped (${n} step${n === 1 ? "" : "s"})`
+      reason: `condition not met (${label}) \u2014 block skipped (${n} step${n === 1 ? "" : "s"})`,
+      flow: sourceFlow,
+      target
     });
-    reportBlockSkipped(state3, step.steps, inner, "when block skipped");
+    reportBlockSkipped(state3, step.steps, sourceFlow, "when block skipped");
     return;
   }
-  pushReport(state3, { ...marker, status: "pass", reason: `condition met (${label})` });
-  await execSteps(state3, step.steps, inner);
+  pushReport(state3, {
+    index,
+    kind: "when",
+    status: "pass",
+    reason: `condition met (${label})`,
+    flow: sourceFlow,
+    target
+  });
+  await execSteps(state3, step.steps, sourceFlow, runStack);
 }
-async function execRunStep(state3, step, scope) {
+async function execRunStep(state3, step, runStack) {
   const index = state3.reports.length;
   const target = step.flow;
   const fail = (reason) => {
-    pushReport(state3, {
-      index,
-      kind: "run",
-      status: "error",
-      flow: target,
-      reason,
-      ...depthOf(scope)
-    });
+    pushReport(state3, { index, kind: "run", status: "error", flow: target, reason });
     state3.stopped = true;
   };
-  if (scope.runStack.includes(target)) {
-    return fail(`cyclic flow reference: ${[...scope.runStack, target].join(" \u2192 ")}`);
+  if (runStack.includes(target)) {
+    return fail(`cyclic flow reference: ${[...runStack, target].join(" \u2192 ")}`);
   }
-  if (scope.runStack.length >= MAX_RUN_DEPTH) {
+  if (runStack.length >= MAX_RUN_DEPTH) {
     return fail("max run depth exceeded");
   }
   let fragment;
@@ -149464,21 +149371,11 @@ async function execRunStep(state3, step, scope) {
   } catch (err) {
     return fail(`could not load fragment "${target}": ${errMsg2(err)}`);
   }
-  pushReport(state3, { index, kind: "run", status: "pass", flow: target, ...depthOf(scope) });
-  await execSteps(
-    state3,
-    fragment.steps,
-    childScope(scope, { flow: target, runStack: [...scope.runStack, target] })
-  );
+  pushReport(state3, { index, kind: "run", status: "pass", flow: target });
+  await execSteps(state3, fragment.steps, target, [...runStack, target]);
 }
-async function execLeafStep(state3, step, index, scope) {
-  const base = {
-    index,
-    kind: step.kind,
-    flow: scope.flow,
-    target: stepTarget(step),
-    ...depthOf(scope)
-  };
+async function execLeafStep(state3, step, index, sourceFlow) {
+  const base = { index, kind: step.kind, flow: sourceFlow, target: stepTarget(step) };
   const { registry: registry2, ctx, device, signal } = state3;
   switch (step.kind) {
     case "echo":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/argent",
-  "version": "0.16.1-next.11",
+  "version": "0.16.1-next.3",
   "description": "MCP server for iOS Simulator and Android Emulator control",
   "license": "Apache-2.0",
   "repository": {