@swmansion/argent 0.16.1-next.7 → 0.16.1-next.9

package/dist/cli-cmds.mjs

@@ -8423,6 +8423,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 +8496,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 +8509,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 +8599,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 +8677,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/mcp-server.mjs

@@ -18896,6 +18896,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 +18924,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 +18945,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 +18961,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

@@ -105916,6 +105916,7 @@ 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");
@@ -105924,7 +105925,8 @@ 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
+      timeout: 1e4,
+      killSignal: SIMCTL_KILL_SIGNAL
     });
     const data = JSON.parse(stdout);
     const out = [];
@@ -105986,7 +105988,7 @@ async function ensureAutomationEnabled(udid) {
       "-bool",
       "true"
     ],
-    { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
+    { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
   );
 }
 async function isEntitlementBypassActive(udid) {
@@ -106001,7 +106003,7 @@ async function isEntitlementBypassActive(udid) {
       "com.apple.Accessibility",
       "IgnoreAXServerEntitlements"
     ],
-    { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
+    { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
   ).then(({ stdout }) => stdout.trim() === "1").catch(() => false);
 }
 function accessibilityPlistPath(udid) {
@@ -106236,7 +106238,7 @@ async function ensureAccessibilityEnabled(udid) {
           "-bool",
           "true"
         ],
-        { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
+        { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
       )
     )
   );
@@ -106246,7 +106248,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 }
+    { encoding: "utf8", timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
   ).catch((e) => ({ stdout: e.stdout ?? "" }));
   const existing = (result.stdout ?? "").trim();
   const updated = buildDyldInsertLibraries(existing, bootstrapPath);
@@ -106254,7 +106256,7 @@ async function setupNativeDevtoolsEnvLocal(udid, endpoint) {
     await execFileAsync8(
       "xcrun",
       ["simctl", "spawn", udid, "launchctl", "setenv", "DYLD_INSERT_LIBRARIES", updated],
-      { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
+      { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
     );
   }
   if (endpoint.transport === "tcp") {
@@ -106272,7 +106274,7 @@ async function setupNativeDevtoolsEnvLocal(udid, endpoint) {
         "NATIVE_DEVTOOLS_IOS_CDP_PORT",
         String(endpoint.port)
       ],
-      { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
+      { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
     );
   } else {
     await execFileAsync8(
@@ -106286,7 +106288,7 @@ async function setupNativeDevtoolsEnvLocal(udid, endpoint) {
         "NATIVE_DEVTOOLS_IOS_CDP_SOCKET",
         endpoint.socketPath
       ],
-      { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
+      { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
     );
   }
   await ensureAccessibilityEnabled(udid);
@@ -106316,7 +106318,9 @@ function parseUIKitApplicationBundleIds(stdout) {
 }
 async function listRunningUIKitApplicationBundleIds(udid) {
   const { stdout } = await execFileAsync8("xcrun", ["simctl", "spawn", udid, "launchctl", "list"], {
-    encoding: "utf8"
+    encoding: "utf8",
+    timeout: SIMCTL_SPAWN_TIMEOUT_MS,
+    killSignal: SIMCTL_KILL_SIGNAL
   });
   return parseUIKitApplicationBundleIds(stdout);
 }
@@ -149128,7 +149132,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);
@@ -149263,7 +149271,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) {
@@ -149271,13 +149285,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) {
@@ -149287,22 +149302,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;
   }
@@ -149311,7 +149329,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,
@@ -149321,17 +149339,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;
@@ -149339,28 +149360,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;
@@ -149368,37 +149379,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;
@@ -149409,11 +149417,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.7",
+  "version": "0.16.1-next.9",
   "description": "MCP server for iOS Simulator and Android Emulator control",
   "license": "Apache-2.0",
   "repository": {