@swmansion/argent 0.20.1-next.4 → 0.20.1-next.6

package/dist/tool-server.cjs

@@ -122457,7 +122457,6 @@ Use when you need to zoom in or out on a map, image, or zoomable view. Returns {
 
 // ../tool-server/src/tools/gesture-rotate/index.ts
 init_zod();
-init_src();
 var zodSchema22 = external_exports.object({
   udid: external_exports.string().describe("Target device id from `list-devices` (iOS UDID or Android serial)."),
   centerX: external_exports.number().describe(
@@ -122483,16 +122482,6 @@ var zodSchema22 = external_exports.object({
 }).refine((p) => p.radius !== void 0 || p.radiusX !== void 0, {
   message: "Pass radius, or both radiusX and radiusY."
 });
-var inputSchema = {
-  ...zodObjectToJsonSchema(zodSchema22),
-  anyOf: [
-    { required: ["radiusX", "radiusY"] },
-    {
-      required: ["radius"],
-      not: { anyOf: [{ required: ["radiusX"] }, { required: ["radiusY"] }] }
-    }
-  ]
-};
 var capability14 = {
   apple: { simulator: true, device: true },
   appleRemote: { simulator: true },
@@ -122517,9 +122506,9 @@ var gestureRotateTool = {
 endAngle > startAngle = clockwise rotation. Typical values: radius 0.15, startAngle 0, endAngle 90 for a 90\xB0 clockwise turn. A single radius applies to both axes, so on a non-square screen it traces a physical ellipse (finger separation varies through the turn); pass radiusX+radiusY (fractions of width/height with radiusX\xB7width = radiusY\xB7height) for a physically circular orbit instead.
 Auto-generates interpolated frames at ~60fps.
 Unlike gesture-pinch which moves fingers linearly to zoom, this orbits fingers in an arc to change orientation.
-Use when you need to rotate a map, image picker, or any rotateable UI element. Returns { rotated: true, timestampMs }. Fails if the simulator-server / emulator backend is not reachable for the given device.`,
+Use when you need to rotate a map, image picker, or any rotateable UI element. Returns { rotated: true, timestampMs }. Fails if the simulator-server / emulator backend is not reachable for the given device.
+Size the orbit with radius, or with radiusX and radiusY together (the pair overrides radius); one half of the pair alone, or none of the three, is rejected.`,
   zodSchema: zodSchema22,
-  inputSchema,
   capability: capability14,
   services: (params) => ({
     simulatorServer: simulatorServerRef(resolveDevice(params.udid))
@@ -142728,6 +142717,12 @@ function selectorTree(sel) {
   walk(sel);
   return out;
 }
+function blockSteps(step) {
+  return isBlockStep(step) ? step.steps : void 0;
+}
+function isBlockStep(step) {
+  return isBlockDirectiveKey(step.kind);
+}
 function isE2eFlow(flow) {
   const first = flow.steps.find((s) => s.kind !== "echo");
   return first?.kind === "launch";
@@ -143392,6 +143387,10 @@ var STEP_DIRECTIVE_KEYS = [
   "rotate",
   "snapshot"
 ];
+var BLOCK_DIRECTIVE_KEYS = ["when"];
+function isBlockDirectiveKey(key2) {
+  return BLOCK_DIRECTIVE_KEYS.includes(key2);
+}
 function parseTapTimes(raw, entry) {
   if (raw === void 0) return void 0;
   if (typeof raw !== "number" || !Number.isInteger(raw) || raw < 1 || raw > 10) {
@@ -143584,14 +143583,26 @@ function parseWhenCondition(raw) {
   }
   return { kind: "ui", ...cond };
 }
-var MAX_WHEN_DEPTH = 20;
-function parseWhenStep(raw, depth) {
-  if (depth >= MAX_WHEN_DEPTH) {
+var MAX_BLOCK_DEPTH = 20;
+function assertBlockDepth(raw, depth) {
+  if (depth >= MAX_BLOCK_DEPTH) {
+    const directives = BLOCK_DIRECTIVE_KEYS.map((key2) => `\`${key2}:\``).join("/");
     badEntry(
       raw,
-      `when blocks nest deeper than ${MAX_WHEN_DEPTH} levels \u2014 check for a cyclic YAML alias (\`steps: &s \u2026 steps: *s\`)`
+      `${directives} blocks nest deeper than ${MAX_BLOCK_DEPTH} levels \u2014 check for a cyclic YAML alias (\`steps: &s \u2026 steps: *s\`)`
     );
   }
+}
+function parseBlockSteps(raw, depth, emptyDetail) {
+  assertBlockDepth(raw, depth);
+  if (!Array.isArray(raw.steps) || raw.steps.length === 0) badEntry(raw, emptyDetail);
+  return raw.steps.map((s) => {
+    if (s !== null && typeof s === "object") return fromYamlStep(s, depth + 1);
+    return badEntry(s, "step must be an object");
+  });
+}
+function parseWhenStep(raw, depth) {
+  assertBlockDepth(raw, depth);
   if ("else" in raw) {
     badEntry(
       raw,
@@ -143602,13 +143613,7 @@ function parseWhenStep(raw, depth) {
     badEntry(raw, "a when step takes exactly { when: <condition>, steps: [...] }");
   }
   const condition = parseWhenCondition(raw.when);
-  if (!Array.isArray(raw.steps) || raw.steps.length === 0) {
-    badEntry(raw, "when needs a non-empty steps list to guard");
-  }
-  const steps = raw.steps.map((s) => {
-    if (s !== null && typeof s === "object") return fromYamlStep(s, depth + 1);
-    return badEntry(s, "step must be an object");
-  });
+  const steps = parseBlockSteps(raw, depth, "when needs a non-empty steps list to guard");
   return { kind: "when", condition, steps };
 }
 function runTargetName(target) {
@@ -143647,7 +143652,7 @@ function completeRunExtension(value) {
   const candidate = `${value}.yaml`;
   return FLOW_FILE_NAME_PATTERN.test(path31.posix.basename(candidate)) ? candidate : value;
 }
-function fromYamlStep(raw, whenDepth = 0) {
+function fromYamlStep(raw, blockDepth = 0) {
   const entry = raw;
   if ("optional" in raw) {
     badEntry(
@@ -143670,7 +143675,7 @@ function fromYamlStep(raw, whenDepth = 0) {
     );
   }
   const kind = kinds[0];
-  if (kind !== "when") {
+  if (!isBlockDirectiveKey(kind)) {
     const siblings = kind === "tool" ? ["tool", "args", "delayMs"] : [kind];
     const extras = Object.keys(entry).filter((k) => !siblings.includes(k));
     if (extras.length > 0) {
@@ -143683,7 +143688,7 @@ function fromYamlStep(raw, whenDepth = 0) {
   if ("echo" in raw) return { kind: "echo", message: String(raw.echo) };
   if ("launch" in raw) return { kind: "launch", app: parseLaunch(raw.launch) };
   if ("run" in raw) return { kind: "run", flow: parseRunTarget(raw, raw.run) };
-  if ("when" in raw) return parseWhenStep(entry, whenDepth);
+  if ("when" in raw) return parseWhenStep(entry, blockDepth);
   if ("tap" in raw) return parseTap(raw.tap, raw);
   if ("long-press" in raw) {
     return parseLongPress(raw["long-press"], raw);
@@ -144399,11 +144404,13 @@ function stepRequiresDevice(registry2, step) {
   }
 }
 function flowRequiresDevice(registry2, steps) {
-  return steps.some((step) => stepRequiresDevice(registry2, step));
+  return steps.some(
+    (step) => stepRequiresDevice(registry2, step) || flowRequiresDevice(registry2, blockSteps(step) ?? [])
+  );
 }
 function flowScopesDevice(registry2, steps) {
   return steps.some(
-    (step) => step.kind === "tool" && declaresAny(registry2, step.name, DEVICE_BIND_LIST_KEYS)
+    (step) => step.kind === "tool" && declaresAny(registry2, step.name, DEVICE_BIND_LIST_KEYS) || flowScopesDevice(registry2, blockSteps(step) ?? [])
   );
 }
 function toolRequiresDevice(registry2, toolName) {
@@ -148397,7 +148404,7 @@ var zodSchema65 = external_exports.object({
     "Path to the flow .yaml as readable by the tool-server. Internal \u2014 the argent client derives it from project_root and name automatically; leave unset."
   ),
   flow_path: external_exports.string().optional().describe(
-    "Absolute path to a co-located flow .yaml on the client and tool server's shared filesystem. This must be supplied through the file-input boundary. For remote execution, pass name + project_root instead."
+    "Omit when name is set. Absolute path to a co-located flow .yaml on the client and tool server's shared filesystem. This must be supplied through the file-input boundary. For remote execution, pass name + project_root instead."
   ),
   device: external_exports.string().optional().describe(
     "Device id to run against (iOS UDID, Android/Vega serial, Chromium id) \u2014 the id list-devices reports. Auto-detected when omitted, but only when exactly one booted device matches (optionally narrowed by `platform`); with several booted the run fails and lists them, so pass this explicitly whenever more than one device is up."
@@ -148420,14 +148427,6 @@ var zodSchema65 = external_exports.object({
     });
   }
 });
-var inputSchema2 = {
-  ...zodObjectToJsonSchema(zodSchema65),
-  // Zod's JSON Schema conversion cannot represent superRefine. `oneOf` makes
-  // the same exactly-one source rule visible to MCP and HTTP clients: neither
-  // branch matches when both fields are absent, and both branches match (which
-  // is invalid for oneOf) when both fields are present.
-  oneOf: [{ required: ["name"] }, { required: ["flow_path"] }]
-};
 var fileInputs3 = [
   {
     target: "flow_path",
@@ -148681,7 +148680,8 @@ function displayFlowName(params) {
 function* walkSteps(steps) {
   for (const step of steps) {
     yield step;
-    if (step.kind === "when") yield* walkSteps(step.steps);
+    const inner = blockSteps(step);
+    if (inner) yield* walkSteps(inner);
   }
 }
 function assertUploadSelfContained(flow) {
@@ -148768,10 +148768,10 @@ off <id>\`, or \`retired <id> (same app relaunched)\` when the instance it left
 a relaunch that retired an older owned instance names both.
 
 If a fragment has an execution prerequisite and prerequisiteAcknowledged is not set to true, the tool
-returns a notice with the prerequisite instead of running.`,
+returns a notice with the prerequisite instead of running.
+Pass exactly one flow source: name for a saved flow under project_root, or flow_path for an explicit YAML \u2014 both together, or neither, fails the call.`,
     longRunning: true,
     zodSchema: zodSchema65,
-    inputSchema: inputSchema2,
     fileInputs: fileInputs3,
     services: () => ({}),
     async execute(_services, params, ctx) {
@@ -149082,8 +149082,18 @@ function stepTarget(step) {
       return step.cropOn ? `"${step.name}" cropOn ${selectorLabel2(step.cropOn)}` : `"${step.name}"`;
     case "run":
       return step.flow;
-    default:
+    case "echo":
+    case "tool":
+      return void 0;
+    case "launch":
+      return void 0;
+    case "wait":
+      return void 0;
+    default: {
+      const unclassified = step;
+      void unclassified;
       return void 0;
+    }
   }
 }
 function scopeFlow(scope) {
@@ -149125,7 +149135,8 @@ async function execSteps(state3, steps, scope) {
         // line rather than vanishing — matching reportBlockSkipped.
         ...step.kind === "echo" ? { message: step.message } : {}
       });
-      if (step.kind === "when") reportBlockSkipped(state3, step.steps, childScope(scope));
+      const inner = blockSteps(step);
+      if (inner) reportBlockSkipped(state3, inner, childScope(scope));
       continue;
     }
     if (!state3.device && stepRequiresDevice(state3.registry, step)) {
@@ -149139,7 +149150,8 @@ async function execSteps(state3, steps, scope) {
         ...depthOf(scope),
         reason: `step needs a device but the flow was resolved as device-free \u2014 pass an explicit device`
       });
-      if (step.kind === "when") reportBlockSkipped(state3, step.steps, childScope(scope));
+      const inner = blockSteps(step);
+      if (inner) reportBlockSkipped(state3, inner, childScope(scope));
       continue;
     }
     if (state3.signal?.aborted) {
@@ -149154,17 +149166,16 @@ async function execSteps(state3, steps, scope) {
         ...depthOf(scope),
         ...step.kind === "echo" ? { message: step.message } : {}
       });
-      if (step.kind === "when") {
-        reportBlockSkipped(state3, step.steps, childScope(scope), "run aborted");
-      }
+      const inner = blockSteps(step);
+      if (inner) reportBlockSkipped(state3, inner, childScope(scope), "run aborted");
       continue;
     }
     if (step.kind === "run") {
       await execRunStep(state3, step, scope);
       continue;
     }
-    if (step.kind === "when") {
-      await execWhenStep(state3, step, scope);
+    if (isBlockStep(step)) {
+      await execBlockStep(state3, step, scope);
       continue;
     }
     const report = await execLeafStep(state3, step, index, scope);
@@ -149188,7 +149199,18 @@ function reportBlockSkipped(state3, steps, scope, reason) {
       ...depthOf(scope),
       ...step.kind === "echo" ? { message: step.message } : {}
     });
-    if (step.kind === "when") reportBlockSkipped(state3, step.steps, childScope(scope), reason);
+    const inner = blockSteps(step);
+    if (inner) reportBlockSkipped(state3, inner, childScope(scope), reason);
+  }
+}
+async function execBlockStep(state3, step, scope) {
+  switch (step.kind) {
+    case "when":
+      return execWhenStep(state3, step, scope);
+    default: {
+      const unhandled = step.kind;
+      void unhandled;
+    }
   }
 }
 async function execWhenStep(state3, step, scope) {
@@ -149564,7 +149586,6 @@ async function resolveFlowSource(params, fileInput, flowPathInput) {
 // ../tool-server/src/tools/flows/flow-read-prerequisite.ts
 init_zod();
 var fs50 = __toESM(require("node:fs/promises"));
-init_src();
 var zodSchema66 = external_exports.object({
   name: external_exports.string().optional().describe(
     'Name of a saved flow to inspect from `.argent/flows` (e.g. "settings-explore"). Omit when flow_path is set.'
@@ -149576,7 +149597,7 @@ var zodSchema66 = external_exports.object({
     "Path to the flow .yaml as readable by the tool-server. Internal \u2014 the argent client derives it from project_root and name automatically; leave unset."
   ),
   flow_path: external_exports.string().optional().describe(
-    "Absolute path to a co-located flow .yaml on the client and tool server's shared filesystem. This must be supplied through the file-input boundary. Pass the same flow source here as to flow-execute, so the prerequisite you read belongs to the flow that will run; for remote reads, pass name + project_root instead."
+    "Omit when name is set. Absolute path to a co-located flow .yaml on the client and tool server's shared filesystem. This must be supplied through the file-input boundary. Pass the same flow source here as to flow-execute, so the prerequisite you read belongs to the flow that will run; for remote reads, pass name + project_root instead."
   )
 }).superRefine((params, ctx) => {
   if (params.name === void 0 === (params.flow_path === void 0)) {
@@ -149587,14 +149608,6 @@ var zodSchema66 = external_exports.object({
     });
   }
 });
-var inputSchema3 = {
-  ...zodObjectToJsonSchema(zodSchema66),
-  // Zod's JSON Schema conversion cannot represent superRefine. `oneOf` makes
-  // the same exactly-one source rule visible to MCP and HTTP clients — the
-  // identical addition flow-execute makes, so the pre-flight read advertises
-  // the same contract as the run it precedes.
-  oneOf: [{ required: ["name"] }, { required: ["flow_path"] }]
-};
 var fileInputs4 = [
   {
     target: "flow_path",
@@ -149622,9 +149635,9 @@ Returns the prerequisite description so you can verify the required state is met
 Use when you need to check what app/simulator state is required before executing a flow; pass the same flow
 source (name or flow_path) you will pass to flow-execute, so the prerequisite you read is the contract of
 the flow that will actually run.
-Fails if the flow file does not exist.`,
+Fails if the flow file does not exist.
+Address the flow exactly as you will address it in flow-execute: name or flow_path, one and only one; supplying both or neither is rejected.`,
   zodSchema: zodSchema66,
-  inputSchema: inputSchema3,
   fileInputs: fileInputs4,
   services: () => ({}),
   async execute(_services, params, ctx) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/argent",
-  "version": "0.20.1-next.4",
+  "version": "0.20.1-next.6",
   "mcpName": "io.github.software-mansion/argent",
   "description": "MCP server for iOS Simulator and Android Emulator control",
   "license": "Apache-2.0",