@swmansion/argent 0.16.1-next.8 → 0.16.1

package/dist/cli-cmds.mjs

@@ -6226,6 +6226,7 @@ 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",
@@ -7133,7 +7134,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.16.0";
+    return "0.16.1";
   }
   return "0.0.0";
 }
@@ -8423,6 +8424,11 @@ 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]
 
@@ -8491,11 +8497,12 @@ 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} \u203A ${s.message}${reason}`;
+    return `  ${STATUS_GLYPH.skip} ${indent}\u203A ${s.message}${reason}`;
   }
-  return `  \u203A ${s.message}`;
+  return `  ${indent}\u203A ${s.message}`;
 }
 function renderStepLine(s, n2, topFlow) {
   const where = s.flow && s.flow !== topFlow ? ` [${s.flow}]` : "";
@@ -8503,7 +8510,10 @@ 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)} ${label}${where}${reason}`;
+  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}`;
 }
 function renderSummary(report, opts = {}) {
   const warnings = report.steps.filter((s) => s.warning).length;
@@ -8590,10 +8600,10 @@ function renderReport(report) {
     }
     n2++;
     lines.push(renderStepLine(s, n2, report.flow));
-    if (s.warning) lines.push(`       \u26A0 ${s.warning}`);
+    if (s.warning) lines.push(renderUnderStepLine(s, n2, `\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(`       ${k}: ${v}`);
+        if (typeof v === "string") lines.push(renderUnderStepLine(s, n2, `${k}: ${v}`));
       }
     }
   }
@@ -8668,7 +8678,7 @@ async function flow(argv, options) {
     }
     liveIndex++;
     console.log(renderStepLine(s, liveIndex, flowName));
-    if (s.warning) console.log(`       \u26A0 ${s.warning}`);
+    if (s.warning) console.log(renderUnderStepLine(s, liveIndex, `\u26A0 ${s.warning}`));
   };
   let report;
   try {

package/dist/installer.mjs

@@ -16120,6 +16120,7 @@ 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",
@@ -17027,7 +17028,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID3();
 function readCliVersion() {
   if (true) {
-    return "0.16.0";
+    return "0.16.1";
   }
   return "0.0.0";
 }

package/dist/mcp-server.mjs

@@ -17652,6 +17652,7 @@ 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",
@@ -18896,6 +18897,11 @@ 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();
@@ -18919,12 +18925,15 @@ 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}${stepLabel(step)}${suffix}${warning}` });
+    blocks.push({
+      type: "text",
+      text: `[${num}] ${glyph}${stepIndent(step.depth)}${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));
+      blocks.push(...await stepArtifactBlocks(step.artifacts, step.status, ctx, step.depth));
     }
   }
   if (result.ok !== void 0) {
@@ -18937,7 +18946,7 @@ async function flowRunToMcpContent(result, ctx) {
   }
   return blocks;
 }
-async function stepArtifactBlocks(artifacts, status, ctx) {
+async function stepArtifactBlocks(artifacts, status, ctx, depth) {
   const failed = status === "fail" || status === "error";
   const entries = [];
   let diffImage;
@@ -18953,7 +18962,8 @@ async function stepArtifactBlocks(artifacts, status, ctx) {
       entries.push([k, v]);
     }
   }
-  const blocks = entries.length > 0 ? [{ type: "text", text: entries.map(([k, v]) => `  ${k}: ${v}`).join("\n") }] : [];
+  const indent = stepIndent(depth);
+  const blocks = entries.length > 0 ? [{ type: "text", text: entries.map(([k, v]) => `  ${indent}${k}: ${v}`).join("\n") }] : [];
   if (diffImage) blocks.push(diffImage);
   return blocks;
 }

package/dist/tool-server.cjs

@@ -293,6 +293,7 @@ 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",
@@ -104399,7 +104400,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.16.0";
+    return "0.16.1";
   }
   return "0.0.0";
 }
@@ -104704,22 +104705,46 @@ function requireDylibIn(dir, name) {
   }
   return p;
 }
+function requireTcpArtifact(dir, name, kind, envVar) {
+  const p = path5.join(dir, name);
+  if (!fs3.existsSync(p)) {
+    throw new Error(
+      `TCP-transport ${kind} not found: ${p}. This ${kind} is required to drive an ios-remote (sim-remote) device over the QUIC tunnel. It ships in the argent package under bin/tcp/ and dylibs/tcp/ (platform-neutral); if you are running a local build, produce it with \`npm run build:ios-binaries:tcp\`. To point the lookup at a directory that already contains it, set ${envVar}=<dir>.`
+    );
+  }
+  return p;
+}
 var bootstrapDylibPath = () => {
   requireDarwin("bootstrapDylibPath");
   return requireDylibIn(DYLIB_DIR, "libArgentInjectionBootstrap.dylib");
 };
 var bootstrapDylibPathTcp = () => {
-  return requireDylibIn(DYLIB_TCP_DIR, "libArgentInjectionBootstrap.dylib");
+  return requireTcpArtifact(
+    DYLIB_TCP_DIR,
+    "libArgentInjectionBootstrap.dylib",
+    "dylib",
+    "ARGENT_NATIVE_DEVTOOLS_TCP_DIR"
+  );
 };
 var bootstrapDylibPathTvos = () => {
   requireDarwin("bootstrapDylibPathTvos");
   return requireDylibIn(DYLIB_TVOS_DIR, "libArgentInjectionBootstrap.dylib");
 };
 var nativeDevtoolsDylibPathTcp = () => {
-  return requireDylibIn(DYLIB_TCP_DIR, "libNativeDevtoolsIos.dylib");
+  return requireTcpArtifact(
+    DYLIB_TCP_DIR,
+    "libNativeDevtoolsIos.dylib",
+    "dylib",
+    "ARGENT_NATIVE_DEVTOOLS_TCP_DIR"
+  );
 };
 var keyboardPatchDylibPathTcp = () => {
-  return requireDylibIn(DYLIB_TCP_DIR, "libKeyboardPatch.dylib");
+  return requireTcpArtifact(
+    DYLIB_TCP_DIR,
+    "libKeyboardPatch.dylib",
+    "dylib",
+    "ARGENT_NATIVE_DEVTOOLS_TCP_DIR"
+  );
 };
 function tcpInjectionDylibs() {
   return [
@@ -104737,8 +104762,8 @@ function hostPlatformKey() {
 function platformBinDir() {
   return path5.join(BIN_DIR, hostPlatformKey());
 }
-function platformTcpBinDir() {
-  return process.env.ARGENT_SIMULATOR_SERVER_TCP_DIR ?? path5.join(platformBinDir(), "tcp");
+function tcpBinDir() {
+  return process.env.ARGENT_SIMULATOR_SERVER_TCP_DIR ?? path5.join(BIN_DIR, "tcp");
 }
 function simulatorServerBinaryPath() {
   const p = path5.join(platformBinDir(), "simulator-server");
@@ -104766,7 +104791,7 @@ function axServiceBinaryPath() {
   return requireBinIn(platformBinDir(), "ax-service");
 }
 function axServiceBinaryPathTcp() {
-  return requireBinIn(platformTcpBinDir(), "ax-service");
+  return requireTcpArtifact(tcpBinDir(), "ax-service", "binary", "ARGENT_SIMULATOR_SERVER_TCP_DIR");
 }
 function tvosAxServiceBinaryPath() {
   requireDarwin("tvos-ax-service");
@@ -105776,7 +105801,7 @@ var import_node_path4 = __toESM(require("node:path"));
 var import_semver = __toESM(require_semver2());
 
 // ../tool-server/package.json
-var version3 = "0.16.0";
+var version3 = "0.16.1";
 
 // ../tool-server/src/utils/update-checker.ts
 var import_update_core = __toESM(require_dist4());
@@ -106143,6 +106168,7 @@ async function simctlSpawn(udid, opts) {
   const cmd = ["spawn", stripRemotePrefix(udid)];
   if (opts.binPath) cmd.push("--bin", opts.binPath);
   if (opts.detach) cmd.push("--detach");
+  cmd.push("--json");
   const args = opts.args ?? [];
   if (args.length > 0) cmd.push("--", ...args);
   const { stdout } = await run(cmd, { timeoutMs: 6e4 });
@@ -116810,6 +116836,43 @@ 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) {
@@ -117020,7 +117083,7 @@ var nativeDevtoolsBlueprint = {
       });
       await host.startProxy(udid, endpoint.port);
     } else {
-      server.listen(socketPath);
+      await bindNativeDevtoolsUnixSocket(server, socketPath);
     }
     await ensureEnvReady().catch(() => {
     });
@@ -117385,6 +117448,10 @@ function adaptAXDescribeToDescribeResult(response) {
 
 // ../tool-server/src/tools/describe/platforms/ios/index.ts
 var DEGRADED_HINT = "This simulator was not booted through argent \u2014 system dialogs and native modals may not appear. You MUST call boot-device with force=true now to restart the simulator and apply full accessibility settings before continuing.";
+function tcpArtifactHint(err) {
+  const message = err instanceof Error ? err.message : typeof err === "string" ? err : "";
+  return /TCP-transport (?:binary|dylib) not found/.test(message) ? message : void 0;
+}
 var TVOS_HINT = "This is an Apple TV (tvOS) simulator, which the iOS accessibility service does not support. Use the `describe` tool to read the focused and focusable elements, `tv-remote` (up/down/left/right/select/back/menu/home) to move focus, and `keyboard` to type. See the argent-tv-interact skill.";
 var NON_INJECTABLE_HINT = "This is an Apple system app (com.apple.*), which cannot load argent's native-devtools instrumentation \u2014 the native view hierarchy is unavailable and restarting the app will NOT help. Take a `screenshot` to see the screen and interact by coordinate. " + NON_INJECTABLE_NATIVE_WARNING;
 function emptyTree() {
@@ -117408,9 +117475,9 @@ async function describeIos(registry2, device, params, options = {}) {
     const response = await axApi.describe();
     tree = adaptAXDescribeToDescribeResult(response);
     hint = axApi.degraded ? DEGRADED_HINT : void 0;
-  } catch {
+  } catch (err) {
     tree = emptyTree();
-    hint = DEGRADED_HINT;
+    hint = tcpArtifactHint(err) ?? DEGRADED_HINT;
   }
   if (tree.children.length > 0) {
     return { tree, source: "ax-service", hint };
@@ -125750,6 +125817,14 @@ 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"],
@@ -125769,7 +125844,7 @@ var iosImpl3 = {
         { cause: err instanceof Error ? err : new Error(String(err)) }
       );
     }
-    return { opened: true, url: params.url };
+    return { opened: true, url: params.url, note: httpDeepLinkNote(params.url) };
   }
 };
 
@@ -125793,7 +125868,7 @@ var androidImpl5 = {
         error_kind: "subprocess"
       });
     }
-    return { opened: true, url: params.url };
+    return { opened: true, url: params.url, note: httpDeepLinkNote(params.url) };
   }
 };
 
@@ -125802,7 +125877,7 @@ var iosRemoteImpl5 = {
   requires: ["sim-remote"],
   handler: async (_services, params) => {
     await simctlOpenUrl(params.udid, params.url);
-    return { opened: true, url: params.url };
+    return { opened: true, url: params.url, note: httpDeepLinkNote(params.url) };
   }
 };
 
@@ -125833,7 +125908,8 @@ 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.
-Returns { opened, url }. Fails if no app is registered to handle the URI (iOS/Android) or the renderer rejects the navigation (Chromium).`,
+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).`,
   zodSchema: zodSchema14,
   capability: capability6,
   services: (params) => {
@@ -149132,7 +149208,11 @@ returns a notice with the prerequisite instead of running.`,
       };
       let aborted2;
       try {
-        await execSteps(state3, flow.steps, params.name, [params.name]);
+        await execSteps(state3, flow.steps, {
+          flow: params.name,
+          runStack: [params.name],
+          depth: 0
+        });
       } finally {
         aborted2 = state3.signal?.aborted === true;
         if (state3.pinned) await restoreStatusBar(device);
@@ -149267,7 +149347,13 @@ function stepTarget(step) {
       return void 0;
   }
 }
-async function execSteps(state3, steps, sourceFlow, runStack) {
+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) {
   for (const step of steps) {
     const index = state3.reports.length;
     if (state3.stopped) {
@@ -149275,13 +149361,14 @@ async function execSteps(state3, steps, sourceFlow, runStack) {
         index,
         kind: step.kind,
         status: "skip",
-        flow: sourceFlow,
+        flow: scope.flow,
         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, sourceFlow);
+      if (step.kind === "when") reportBlockSkipped(state3, step.steps, childScope(scope));
       continue;
     }
     if (state3.signal?.aborted) {
@@ -149291,22 +149378,25 @@ async function execSteps(state3, steps, sourceFlow, runStack) {
         kind: step.kind,
         status: "skip",
         reason: "run aborted",
-        flow: sourceFlow,
+        flow: scope.flow,
         target: stepTarget(step),
+        ...depthOf(scope),
         ...step.kind === "echo" ? { message: step.message } : {}
       });
-      if (step.kind === "when") reportBlockSkipped(state3, step.steps, sourceFlow, "run aborted");
+      if (step.kind === "when") {
+        reportBlockSkipped(state3, step.steps, childScope(scope), "run aborted");
+      }
       continue;
     }
     if (step.kind === "run") {
-      await execRunStep(state3, step, runStack);
+      await execRunStep(state3, step, scope);
       continue;
     }
     if (step.kind === "when") {
-      await execWhenStep(state3, step, sourceFlow, runStack);
+      await execWhenStep(state3, step, scope);
       continue;
     }
-    const report = await execLeafStep(state3, step, index, sourceFlow);
+    const report = await execLeafStep(state3, step, index, scope);
     pushReport(state3, report);
     if (report.status === "fail" || report.status === "error") state3.stopped = true;
   }
@@ -149315,7 +149405,7 @@ function describeWhenCondition(cond) {
   if (cond.kind === "platform") return `platform ${cond.platform}`;
   return conditionLabel(cond, describeSelector);
 }
-function reportBlockSkipped(state3, steps, sourceFlow, reason) {
+function reportBlockSkipped(state3, steps, scope, reason) {
   for (const step of steps) {
     pushReport(state3, {
       index: state3.reports.length,
@@ -149325,17 +149415,20 @@ function reportBlockSkipped(state3, steps, sourceFlow, 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 : sourceFlow,
+      flow: step.kind === "run" ? step.flow : scope.flow,
       target: stepTarget(step),
+      ...depthOf(scope),
       ...step.kind === "echo" ? { message: step.message } : {}
     });
-    if (step.kind === "when") reportBlockSkipped(state3, step.steps, sourceFlow, reason);
+    if (step.kind === "when") reportBlockSkipped(state3, step.steps, childScope(scope), reason);
   }
 }
-async function execWhenStep(state3, step, sourceFlow, runStack) {
+async function execWhenStep(state3, step, scope) {
   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;
@@ -149343,28 +149436,18 @@ async function execWhenStep(state3, step, sourceFlow, runStack) {
   } else {
     const probe3 = await probeWhenCondition(state3, step.condition);
     if (probe3.aborted) {
-      pushReport(state3, {
-        index,
-        kind: "when",
-        status: "skip",
-        reason: "run aborted",
-        flow: sourceFlow,
-        target
-      });
-      reportBlockSkipped(state3, step.steps, sourceFlow, "run aborted");
+      pushReport(state3, { ...marker, status: "skip", reason: "run aborted" });
+      reportBlockSkipped(state3, step.steps, inner, "run aborted");
       return;
     }
     if (!probe3.ok && probe3.indeterminate) {
       pushReport(state3, {
-        index,
-        kind: "when",
+        ...marker,
         status: "error",
-        reason: `could not evaluate when guard (${label}): ${probe3.reason}`,
-        flow: sourceFlow,
-        target
+        reason: `could not evaluate when guard (${label}): ${probe3.reason}`
       });
       state3.stopped = true;
-      reportBlockSkipped(state3, step.steps, sourceFlow, "when guard errored");
+      reportBlockSkipped(state3, step.steps, inner, "when guard errored");
       return;
     }
     met = probe3.ok;
@@ -149372,37 +149455,34 @@ async function execWhenStep(state3, step, sourceFlow, runStack) {
   if (!met) {
     const n = step.steps.length;
     pushReport(state3, {
-      index,
-      kind: "when",
+      ...marker,
       status: "skip",
-      reason: `condition not met (${label}) \u2014 block skipped (${n} step${n === 1 ? "" : "s"})`,
-      flow: sourceFlow,
-      target
+      reason: `condition not met (${label}) \u2014 block skipped (${n} step${n === 1 ? "" : "s"})`
     });
-    reportBlockSkipped(state3, step.steps, sourceFlow, "when block skipped");
+    reportBlockSkipped(state3, step.steps, inner, "when block skipped");
     return;
   }
-  pushReport(state3, {
-    index,
-    kind: "when",
-    status: "pass",
-    reason: `condition met (${label})`,
-    flow: sourceFlow,
-    target
-  });
-  await execSteps(state3, step.steps, sourceFlow, runStack);
+  pushReport(state3, { ...marker, status: "pass", reason: `condition met (${label})` });
+  await execSteps(state3, step.steps, inner);
 }
-async function execRunStep(state3, step, runStack) {
+async function execRunStep(state3, step, scope) {
   const index = state3.reports.length;
   const target = step.flow;
   const fail = (reason) => {
-    pushReport(state3, { index, kind: "run", status: "error", flow: target, reason });
+    pushReport(state3, {
+      index,
+      kind: "run",
+      status: "error",
+      flow: target,
+      reason,
+      ...depthOf(scope)
+    });
     state3.stopped = true;
   };
-  if (runStack.includes(target)) {
-    return fail(`cyclic flow reference: ${[...runStack, target].join(" \u2192 ")}`);
+  if (scope.runStack.includes(target)) {
+    return fail(`cyclic flow reference: ${[...scope.runStack, target].join(" \u2192 ")}`);
   }
-  if (runStack.length >= MAX_RUN_DEPTH) {
+  if (scope.runStack.length >= MAX_RUN_DEPTH) {
     return fail("max run depth exceeded");
   }
   let fragment;
@@ -149413,11 +149493,21 @@ async function execRunStep(state3, step, runStack) {
   } catch (err) {
     return fail(`could not load fragment "${target}": ${errMsg2(err)}`);
   }
-  pushReport(state3, { index, kind: "run", status: "pass", flow: target });
-  await execSteps(state3, fragment.steps, target, [...runStack, target]);
+  pushReport(state3, { index, kind: "run", status: "pass", flow: target, ...depthOf(scope) });
+  await execSteps(
+    state3,
+    fragment.steps,
+    childScope(scope, { flow: target, runStack: [...scope.runStack, target] })
+  );
 }
-async function execLeafStep(state3, step, index, sourceFlow) {
-  const base = { index, kind: step.kind, flow: sourceFlow, target: stepTarget(step) };
+async function execLeafStep(state3, step, index, scope) {
+  const base = {
+    index,
+    kind: step.kind,
+    flow: scope.flow,
+    target: stepTarget(step),
+    ...depthOf(scope)
+  };
   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.8",
+  "version": "0.16.1",
   "description": "MCP server for iOS Simulator and Android Emulator control",
   "license": "Apache-2.0",
   "repository": {