@swmansion/argent 0.14.1-next.13 → 0.14.1-next.15

package/dist/tool-server.cjs

@@ -118565,6 +118565,19 @@ var fs20 = __toESM(require("node:fs"));
 var net5 = __toESM(require("node:net"));
 var path18 = __toESM(require("node:path"));
 init_src();
+
+// ../tool-server/src/utils/electron-env.ts
+function electronGuiChildEnv(overrides = {}) {
+  const env = { ...process.env, ...overrides };
+  for (const key of Object.keys(env)) {
+    if (key.toLowerCase() === "electron_run_as_node") {
+      delete env[key];
+    }
+  }
+  return env;
+}
+
+// ../tool-server/src/tools/devices/boot-electron.ts
 var DEFAULT_READY_TIMEOUT_MS = 3e4;
 async function pickFreePort() {
   return new Promise((resolve5, reject) => {
@@ -118688,7 +118701,12 @@ async function bootElectronApp(options) {
     child = (0, import_node_child_process15.spawn)(launcher.command, args, {
       detached: true,
       stdio: ["ignore", "pipe", "pipe"],
-      env: { ...process.env, ELECTRON_ENABLE_LOGGING: "1" }
+      // Strip ELECTRON_RUN_AS_NODE (see electronGuiChildEnv): if the tool-server
+      // inherited it from an Electron-based MCP host, the Electron binary would
+      // run in Node mode with no CDP endpoint — so boot-device fails below (the
+      // child exits early, or the readiness probe times out) instead of the app
+      // coming up.
+      env: electronGuiChildEnv({ ELECTRON_ENABLE_LOGGING: "1" })
     });
   } catch (err) {
     throw new FailureError(
@@ -129951,10 +129969,7 @@ function num(attrs, key) {
 function isInteractive2(attrs) {
   return isTrue(attrs, "focusable") || isTrue(attrs, "selectable") || isTrue(attrs, "clickable");
 }
-function isMeaningful(node) {
-  return Boolean(node.attrs.role) || isInteractive2(node.attrs) || node.text.length > 0;
-}
-function labelOf2(node) {
+function ownText(node) {
   const parts = [];
   if (node.text) parts.push(node.text);
   for (const c of node.children) {
@@ -129962,6 +129977,9 @@ function labelOf2(node) {
   }
   return parts.join(" ").trim();
 }
+function isMeaningful(node, ownTextValue) {
+  return Boolean(node.attrs.role) || isInteractive2(node.attrs) || ownTextValue.length > 0;
+}
 function normalizeFrame(attrs, screenW, screenH) {
   const x = num(attrs, "x") ?? 0;
   const y = num(attrs, "y") ?? 0;
@@ -129981,20 +129999,28 @@ function normalizeFrame(attrs, screenW, screenH) {
 function clamp(n, lo, hi) {
   return Math.max(lo, Math.min(n, hi));
 }
+function isPlainTextSpan(n) {
+  return n.role === "view" && n.label !== void 0 && n.children.length === 0 && n.identifier === void 0 && !n.clickable && !n.focused && !n.selected;
+}
+function childrenReconstructLabel(children, label) {
+  if (children.length === 0 || !children.every(isPlainTextSpan)) return false;
+  return children.map((c) => c.label).join("") === label;
+}
 function convert(node, screenW, screenH) {
   const childNodes = [];
   for (const c of node.children) {
     if (c.tag === "text") continue;
     childNodes.push(...convert(c, screenW, screenH));
   }
-  if (!isMeaningful(node)) return childNodes;
+  const label = ownText(node);
+  if (!isMeaningful(node, label)) return childNodes;
   const attrs = node.attrs;
+  const keptChildren = label && childrenReconstructLabel(childNodes, label) ? [] : childNodes;
   const out = {
     role: attrs.role || "view",
     frame: normalizeFrame(attrs, screenW, screenH),
-    children: childNodes
+    children: keptChildren
   };
-  const label = labelOf2(node);
   if (label) out.label = label;
   if (attrs.test_id) out.identifier = attrs.test_id;
   if (isInteractive2(attrs)) out.clickable = true;
@@ -142244,7 +142270,11 @@ function createPreviewWindowManager(opts = {}) {
     const launchBin = wrapperBin ?? electronBin;
     const launchArgs = wrapperBin ? ["--no-sandbox", mainScript] : [mainScript];
     const next = (0, import_node_child_process27.spawn)(launchBin, launchArgs, {
-      env: { ...process.env, ARGENT_PREVIEW_URL: url2 },
+      // Strip ELECTRON_RUN_AS_NODE so the child boots as a GUI Electron app, not
+      // a bare Node runtime (see electronGuiChildEnv). An Electron-based MCP
+      // host puts it in our env, and inheriting it makes main.cjs crash at
+      // app.setName() with `app` undefined — the window never opens.
+      env: electronGuiChildEnv({ ARGENT_PREVIEW_URL: url2 }),
       stdio: ["pipe", "ignore", "pipe"]
     });
     next.on("error", (err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/argent",
-  "version": "0.14.1-next.13",
+  "version": "0.14.1-next.15",
   "description": "MCP server for iOS Simulator and Android Emulator control",
   "license": "Apache-2.0",
   "repository": {