@swmansion/argent 0.30.2-next.19 → 0.30.2-next.20

package/dist/cli-cmds.mjs

@@ -35594,7 +35594,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.30.2-next.19";
+    return "0.30.2-next.20";
   }
   return "0.0.0";
 }

package/dist/installer.mjs

@@ -16900,7 +16900,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.30.2-next.19";
+    return "0.30.2-next.20";
   }
   return "0.0.0";
 }

package/dist/mcp-server.mjs

@@ -28531,6 +28531,7 @@ var AUTO_SCREENSHOT_DELAY_MS_BY_TOOL = {
   "await-ui-element": 1500
 };
 var DEFAULT_DELAY_MS = 1400;
+var CAPTURE_TIMEOUT_MS = 15e3;
 function autoScreenshotEnabled(options) {
   return !isFlagEnabled("disable-auto-screenshot", options);
 }
@@ -28648,22 +28649,50 @@ async function fetchWithReconnect(getUrl, reconnect, config2) {
   for (let attempt = 0; attempt <= maxRetries; attempt++) {
     const controller = new AbortController();
     const timer = fetchTimeoutMs !== null ? setTimeout(() => controller.abort(), fetchTimeoutMs) : void 0;
+    let callerSignal;
     try {
       const attemptInit = typeof init === "function" ? init() : init;
-      return await fetch(getUrl(), { ...attemptInit, signal: controller.signal });
+      callerSignal = attemptInit?.signal;
+      const signal = callerSignal ? AbortSignal.any([controller.signal, callerSignal]) : controller.signal;
+      return await fetch(getUrl(), { ...attemptInit, signal });
     } catch (err) {
       lastError = err;
-      if (attempt === maxRetries) break;
-      if (attempt === 0) {
-        await reconnect();
+      if (callerSignal?.aborted || attempt === maxRetries) break;
+      const pause = (async () => {
+        if (attempt === 0) {
+          await reconnect();
+        }
+        await new Promise((r) => setTimeout(r, expBackoffBase * Math.pow(2, attempt)));
+      })();
+      await untilAborted(pause, callerSignal);
+      if (callerSignal?.aborted) {
+        lastError = callerSignal.reason;
+        break;
       }
-      await new Promise((r) => setTimeout(r, expBackoffBase * Math.pow(2, attempt)));
     } finally {
       clearTimeout(timer);
     }
   }
   throw lastError;
 }
+async function untilAborted(work, signal) {
+  if (!signal) {
+    await work;
+    return;
+  }
+  let onAbort = () => {
+  };
+  const aborted2 = new Promise((resolve10) => {
+    onAbort = resolve10;
+    if (signal.aborted) resolve10();
+    else signal.addEventListener("abort", onAbort, { once: true });
+  });
+  try {
+    await Promise.race([work, aborted2]);
+  } finally {
+    signal.removeEventListener("abort", onAbort);
+  }
+}
 function parseUrl(url) {
   let parsed;
   try {
@@ -28708,8 +28737,8 @@ function createToolCaller(deps) {
   });
   return {
     fetchTools: client.fetchTools,
-    async callTool(name, args) {
-      const { data, note, outputHint, profiling } = await client.callTool(name, args);
+    async callTool(name, args, opts) {
+      const { data, note, outputHint, profiling } = await client.callTool(name, args, opts);
       return { result: data, outputHint, note, ...profiling ? { profiling } : {} };
     }
   };
@@ -28724,6 +28753,7 @@ async function startMcpServer(options) {
   }
   const autoScreenshotOn = autoScreenshotEnabled();
   const autoDescribeOn = autoDescribeEnabled();
+  const captureTimeoutMs = options.captureTimeoutMs ?? CAPTURE_TIMEOUT_MS;
   let TOOLS_URL;
   let AUTH_TOKEN;
   const resolved = await getResolvedToolsUrl();
@@ -28786,8 +28816,14 @@ async function startMcpServer(options) {
   async function awaitScreenSettled(udid, toolName) {
     const maxWaitMs = getAutoScreenshotDelayMs(toolName);
     if (maxWaitMs === 0) return true;
+    const started = Date.now();
     try {
-      const idle = await callTool("await-screen-idle", { udid, timeoutMs: maxWaitMs });
+      const idle = await callTool(
+        "await-screen-idle",
+        { udid, timeoutMs: maxWaitMs },
+        // The tool bounds its poll to maxWaitMs; the rest covers its setup.
+        { signal: AbortSignal.timeout(maxWaitMs + captureTimeoutMs) }
+      );
       await spyLog({
         ts: (/* @__PURE__ */ new Date()).toISOString(),
         event: "auto_screenshot_readiness",
@@ -28797,13 +28833,13 @@ async function startMcpServer(options) {
       });
       return idle.result?.settled === true;
     } catch {
-      await new Promise((r) => setTimeout(r, maxWaitMs));
+      await new Promise((r) => setTimeout(r, Math.max(0, maxWaitMs - (Date.now() - started))));
       return false;
     }
   }
-  async function captureScreenshotBlocks(udid) {
+  async function captureScreenshotBlocks(udid, signal) {
     try {
-      const { result } = await callTool("screenshot", { udid });
+      const { result } = await callTool("screenshot", { udid }, { signal });
       const blocks = await toMcpContent(result, "image", {
         toolsUrl: TOOLS_URL,
         authToken: AUTH_TOKEN,
@@ -28815,10 +28851,10 @@ async function startMcpServer(options) {
       return [];
     }
   }
-  async function captureTreeBlocks(udid, toolName) {
+  async function captureTreeBlocks(udid, toolName, signal) {
     const t1 = Date.now();
     try {
-      const d = await callTool("describe", { udid });
+      const d = await callTool("describe", { udid }, { signal });
       const desc = d.result?.description;
       await spyLog({
         ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -28914,9 +28950,10 @@ ${desc}` }];
         }
       } else if (udid && (wantScreenshot || wantTree)) {
         const screenSettled = await awaitScreenSettled(udid, params.name);
-        const screenshot = wantScreenshot ? captureScreenshotBlocks(udid) : Promise.resolve([]);
+        const signal = AbortSignal.timeout(captureTimeoutMs);
+        const screenshot = wantScreenshot ? captureScreenshotBlocks(udid, signal) : Promise.resolve([]);
         if (!screenSettled) await screenshot;
-        const tree = wantTree ? captureTreeBlocks(udid, params.name) : Promise.resolve([]);
+        const tree = wantTree ? captureTreeBlocks(udid, params.name, signal) : Promise.resolve([]);
         content = [...content, ...await screenshot, ...await tree];
       }
       if (note) {

package/dist/tool-server.cjs

@@ -100945,7 +100945,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.30.2-next.19";
+    return "0.30.2-next.20";
   }
   return "0.0.0";
 }

package/package.json

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