@swmansion/argent 0.20.1-next.3 → 0.20.1-next.5

package/dist/tool-server.cjs

@@ -112329,6 +112329,7 @@ var nativeDevtoolsBlueprint = {
         );
       }
       const id = nextRpcId++;
+      const timeoutMs = method === "ViewHierarchy.getFullHierarchy" ? 15e3 : 5e3;
       return new Promise((resolve11, reject) => {
         pendingRpc.set(id, { resolve: resolve11, reject });
         conn.socket.write(
@@ -112349,7 +112350,7 @@ var nativeDevtoolsBlueprint = {
               })
             );
           }
-        }, 5e3);
+        }, timeoutMs);
       });
     }
     if (transport === "unix") {
@@ -122456,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(
@@ -122482,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 },
@@ -122516,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))
@@ -144437,6 +144427,9 @@ function bindDeviceArgs(registry2, toolName, deviceId, args, deviceIsExplicit =
   return out;
 }
 
+// ../tool-server/src/tools/flows/flow-ios-tree.ts
+init_src();
+
 // ../tool-server/src/tools/flows/flow-tree-flatten.ts
 function intersectClip(rect, clip3) {
   if (!clip3) return rect;
@@ -144613,7 +144606,7 @@ var FULL_HIERARCHY_FIELDS = [
   // request, which just leaves the wait's poll unconfirmed.
   "firstResponder"
 ];
-async function queryFullHierarchyTree(registry2, device) {
+async function queryFullHierarchyTree(registry2, device, launchedNativeApp) {
   let nativeApi;
   try {
     const ndRef = nativeDevtoolsRef(device);
@@ -144624,7 +144617,17 @@ async function queryFullHierarchyTree(registry2, device) {
       { cause: err }
     );
   }
-  const target = await resolveNativeTargetApp(nativeApi, void 0);
+  let target;
+  try {
+    target = await resolveNativeTargetApp(nativeApi, void 0);
+  } catch (err) {
+    const timedOut = getFailureSignal(err)?.error_code === FAILURE_CODES.NATIVE_DEVTOOLS_RPC_TIMEOUT;
+    if (timedOut && launchedNativeApp !== void 0 && nativeApi.listConnectedBundleIds().includes(launchedNativeApp)) {
+      target = { bundleId: launchedNativeApp };
+    } else {
+      throw err;
+    }
+  }
   if (await nativeApi.requiresAppRestart(target.bundleId)) {
     throw new Error(
       `${target.bundleId} was launched before argent's instrumentation loaded \u2014 relaunch it (launch-app, or a flow \`launch\` step) so the full view hierarchy is readable`
@@ -144851,9 +144854,9 @@ async function queryVegaTree(device) {
 }
 
 // ../tool-server/src/tools/flows/flow-tree.ts
-async function fetchFlowTree(registry2, device) {
+async function fetchFlowTree(registry2, device, launchedNativeApp) {
   if (device.platform === "ios") {
-    return queryFullHierarchyTree(registry2, device);
+    return queryFullHierarchyTree(registry2, device, launchedNativeApp);
   }
   if (device.platform === "android") {
     return queryAndroidFullHierarchy(registry2, device);
@@ -145405,7 +145408,7 @@ async function settleTree(env) {
     if (env.signal?.aborted) return void 0;
     let tree;
     try {
-      ({ tree } = await fetchFlowTree(env.registry, env.device));
+      ({ tree } = await fetchFlowTree(env.registry, env.device, env.launchedNativeApp));
     } catch (err) {
       lastError = err instanceof Error ? err : new Error(String(err));
     }
@@ -145466,7 +145469,7 @@ async function waitForFocus(env, into, tappedFrame) {
   for (; ; ) {
     if (env.signal?.aborted) return;
     try {
-      const { tree, source } = await fetchFlowTree(env.registry, env.device);
+      const { tree, source } = await fetchFlowTree(env.registry, env.device, env.launchedNativeApp);
       if (!FOCUS_REPORTING_SOURCES.has(source)) return;
       const target = flowSelectorToFrame(tree, into) ?? tappedFrame;
       if (collectFocused(tree, []).some((n) => framesOverlap(n.frame, target))) return;
@@ -145668,7 +145671,7 @@ async function runPinch(env, step) {
 }
 async function fetchScreenAspect(env) {
   try {
-    const { screen } = await fetchFlowTree(env.registry, env.device);
+    const { screen } = await fetchFlowTree(env.registry, env.device, env.launchedNativeApp);
     return screen && screen.width > 0 && screen.height > 0 ? screen.width / screen.height : void 0;
   } catch {
     return void 0;
@@ -145756,7 +145759,7 @@ async function waitForCondition(env, step, timeoutMs) {
   for (; ; ) {
     if (env.signal?.aborted) return ABORTED_OUTCOME;
     try {
-      const data = await fetchFlowTree(env.registry, env.device);
+      const data = await fetchFlowTree(env.registry, env.device, env.launchedNativeApp);
       lastMatches = flowFindAll(data.tree, step.selector);
       fetchError = void 0;
       everMatched ||= lastMatches.length > 0;
@@ -145851,7 +145854,11 @@ async function waitForIdle(env, step) {
     const roundStartedAt = Date.now();
     let answeredReadMs;
     const [read, frame] = await Promise.all([
-      settleWithin(fetchFlowTree(env.registry, env.device), roundBudget, env.signal).then((r) => {
+      settleWithin(
+        fetchFlowTree(env.registry, env.device, env.launchedNativeApp),
+        roundBudget,
+        env.signal
+      ).then((r) => {
         answeredReadMs = Date.now() - roundStartedAt;
         return r;
       }),
@@ -148379,7 +148386,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."
@@ -148402,14 +148409,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",
@@ -148427,8 +148426,15 @@ var fileInputs3 = [
 ];
 var MAX_RUN_DEPTH = 20;
 var POST_LAUNCH_SETTLE_MS = 1500;
-var NATIVE_READY_TIMEOUT_MS = 8e3;
+var NATIVE_READY_TIMEOUT_MS = 15e3;
 var NATIVE_READY_POLL_MS = 250;
+var FOREGROUND_CHANGING_TOOLS = /* @__PURE__ */ new Set([
+  "launch-app",
+  "restart-app",
+  "reinstall-app",
+  "open-url",
+  "button"
+]);
 async function waitForNativeDevtools(registry2, device, bundleId, signal) {
   let api;
   try {
@@ -148509,6 +148515,7 @@ async function runLaunch(state3, app) {
   const gate = await treeSourceGate(registry2, device, bundleId, signal);
   if (signal?.aborted) return ABORTED_OUTCOME;
   if (gate) return { ok: false, reason: gate };
+  state3.launchedNativeApp = bundleId;
   return { ok: true };
 }
 async function runChromiumLaunch(state3, app) {
@@ -148742,10 +148749,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) {
@@ -149369,6 +149376,9 @@ async function execLeafStep(state3, step, index, scope) {
         return { ...base, status: "skip", tool: step.name, reason: "run aborted during delay" };
       }
       try {
+        if (FOREGROUND_CHANGING_TOOLS.has(step.name)) {
+          state3.launchedNativeApp = void 0;
+        }
         const result = await invokeSubTool(registry2, ctx, step.name, args);
         if (isUnmetUiWaitResult(step.name, result)) {
           const note = result.note;
@@ -149535,7 +149545,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.'
@@ -149547,7 +149556,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)) {
@@ -149558,14 +149567,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",
@@ -149593,9 +149594,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.3",
+  "version": "0.20.1-next.5",
   "mcpName": "io.github.software-mansion/argent",
   "description": "MCP server for iOS Simulator and Android Emulator control",
   "license": "Apache-2.0",