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

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") {
@@ -134485,7 +134486,7 @@ function renderCommit(summary, annotations, _sessionContext) {
   const hiddenCount = (summary.totalComponentCount ?? summary.components.length) - summary.components.length;
   if (hiddenCount > 0) {
     lines.push(
-      `- _Shown: ${roundedShown}ms self / ${summary.totalRenderMs}ms commit (${coveragePct}%) \u2014 ${hiddenCount} more components not shown. Use \`profiler-commit-query mode=by_index\` to see all._`
+      `- _Shown: ${roundedShown}ms self / ${summary.totalRenderMs}ms commit (${coveragePct}%) \u2014 ${hiddenCount} more components not shown. Use \`profiler-commit-query mode=by_index commit_index=${summary.commitIndex}\` to see all._`
     );
   } else if (coveragePct < 80) {
     lines.push(
@@ -140684,7 +140685,9 @@ var zodSchema54 = external_exports.object({
   component_name: external_exports.string().optional().describe("Component name for by_component mode"),
   time_range_ms: timeRangeSchema.optional().describe("Time range filter for by_time_range mode"),
   commit_index: external_exports.coerce.number().int().optional().describe("Commit index for by_index and cascade_tree modes"),
-  top_n: external_exports.coerce.number().int().positive().default(20).describe("Max results to return (default 20)")
+  top_n: external_exports.coerce.number().int().positive().optional().describe(
+    "Max results to return. Defaults to 20 for by_component / by_time_range, which count commits. by_index counts individual fibers and returns all of them unless this is set, because one commit's fibers collapse to far fewer distinct components \u2014 a small cap there can show less than the analyze report it is meant to expand on."
+  )
 });
 async function getCommitTree(port, deviceId) {
   const sessionPaths = getCachedProfilerPaths(port, deviceId);
@@ -140821,23 +140824,25 @@ function renderByTimeRange(commits, start2, end, topN2) {
   }
   return lines.join("\n");
 }
-function renderByIndex(commits, commitIndex) {
+function renderByIndex(commits, commitIndex, topN2) {
   const matching = commits.filter((c) => c.commitIndex === commitIndex);
   if (matching.length === 0) {
     return `_Commit #${commitIndex} not found in stored data._`;
   }
   const commitDuration = matching[0].commitDuration;
   const timestamp = matching[0].timestamp;
+  const sorted = [...matching].sort((a, b) => b.actualDuration - a.actualDuration);
+  const shown = topN2 !== void 0 ? sorted.slice(0, topN2) : sorted;
+  const hidden = sorted.length - shown.length;
   const lines = [
-    `## Commit #${commitIndex} \u2014 Full Detail`,
+    `## Commit #${commitIndex} \u2014 ${hidden > 0 ? "Top Fibers" : "Full Detail"}`,
     "",
-    `**Time:** ${timestamp.toFixed(0)}ms  **Duration:** ${commitDuration.toFixed(1)}ms  **Fibers:** ${matching.length}`,
+    `**Time:** ${timestamp.toFixed(0)}ms  **Duration:** ${commitDuration.toFixed(1)}ms  **Fibers:** ${matching.length}${hidden > 0 ? ` (showing ${shown.length})` : ""}`,
     "",
     "| Component | Duration (ms) | Self (ms) | Reason | Parent | Compiler |",
     "|---|---|---|---|---|---|"
   ];
-  const sorted = [...matching].sort((a, b) => b.actualDuration - a.actualDuration);
-  for (const c of sorted) {
+  for (const c of shown) {
     const reason = formatReason2(c);
     const parent = c.parentName ?? "\u2014";
     const compiler = c.isCompilerOptimized ? "\u2713" : "";
@@ -140845,6 +140850,12 @@ function renderByIndex(commits, commitIndex) {
       `| \`${c.componentName}\` | ${c.actualDuration.toFixed(1)} | ${c.selfDuration.toFixed(1)} | ${reason} | \`${parent}\` | ${compiler} |`
     );
   }
+  if (hidden > 0) {
+    lines.push("");
+    lines.push(
+      `_Showing the ${shown.length} costliest of ${sorted.length} fibers \u2014 ${hidden} cheaper fibers hidden. Note these are fibers, not components: the full set covers ${new Set(sorted.map((c) => c.componentName)).size} distinct components and this view covers ${new Set(shown.map((c) => c.componentName)).size}. Omit top_n for everything._`
+    );
+  }
   const withRootCause = matching.find((c) => c.rootCauseParent);
   if (withRootCause?.rootCauseChain && withRootCause.rootCauseChain.length > 0) {
     lines.push("");
@@ -140952,7 +140963,7 @@ Fails if react-profiler-stop has not been called or no commit data is stored.`,
             error_kind: "validation"
           });
         }
-        return renderByComponent(commitTree.commits, params.component_name, params.top_n);
+        return renderByComponent(commitTree.commits, params.component_name, params.top_n ?? 20);
       }
       case "by_time_range": {
         if (!params.time_range_ms) {
@@ -140967,7 +140978,7 @@ Fails if react-profiler-stop has not been called or no commit data is stored.`,
           commitTree.commits,
           params.time_range_ms.start,
           params.time_range_ms.end,
-          params.top_n
+          params.top_n ?? 20
         );
       }
       case "by_index": {
@@ -140979,7 +140990,7 @@ Fails if react-profiler-stop has not been called or no commit data is stored.`,
             error_kind: "validation"
           });
         }
-        return renderByIndex(commitTree.commits, params.commit_index);
+        return renderByIndex(commitTree.commits, params.commit_index, params.top_n);
       }
       case "cascade_tree": {
         if (params.commit_index == null) {
@@ -144427,6 +144438,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;
@@ -144603,7 +144617,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);
@@ -144614,7 +144628,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`
@@ -144841,9 +144865,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);
@@ -145395,7 +145419,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));
     }
@@ -145456,7 +145480,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;
@@ -145658,7 +145682,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;
@@ -145746,7 +145770,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;
@@ -145841,7 +145865,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;
       }),
@@ -148417,8 +148445,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 {
@@ -148499,6 +148534,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) {
@@ -149359,6 +149395,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;

package/package.json

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