@swmansion/argent 0.22.2-next.2 → 0.22.2-next.3

package/dist/cli-cmds.mjs

@@ -7210,7 +7210,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.22.2-next.2";
+    return "0.22.2-next.3";
   }
   return "0.0.0";
 }

package/dist/installer.mjs

@@ -16428,7 +16428,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.22.2-next.2";
+    return "0.22.2-next.3";
   }
   return "0.0.0";
 }

package/dist/tool-server.cjs

@@ -93886,7 +93886,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.22.2-next.2";
+    return "0.22.2-next.3";
   }
   return "0.0.0";
 }
@@ -95398,13 +95398,56 @@ var import_express = __toESM(require_express2());
 
 // ../tool-server/src/blueprints/simulator-server.ts
 var import_node_child_process10 = require("node:child_process");
-var readline2 = __toESM(require("node:readline"));
+var readline = __toESM(require("node:readline"));
 init_src();
 
 // ../tool-server/src/blueprints/ax-service.ts
 var net = __toESM(require("node:net"));
 var fs13 = __toESM(require("node:fs"));
-var readline = __toESM(require("node:readline"));
+
+// ../tool-server/src/utils/ndjson-socket.ts
+var PREVIEW_CHARS = 80;
+function preview(raw) {
+  const printable = raw.replace(/[\x00-\x1f\x7f\u2028\u2029]/g, "\xB7");
+  return printable.length > PREVIEW_CHARS ? `${printable.slice(0, PREVIEW_CHARS)}\u2026` : printable;
+}
+function reportDroppedFrameToStderr(tag3) {
+  return ({ bytes, preview: preview2 }) => {
+    process.stderr.write(`[${tag3}] dropped unparseable frame (${bytes} bytes): ${preview2}
+`);
+  };
+}
+function attachNdjsonReader(socket, handlers) {
+  socket.setEncoding("utf8");
+  let buf = "";
+  const deliver = (raw) => {
+    if (raw.length === 0 || raw === "\r") return;
+    let msg;
+    try {
+      msg = JSON.parse(raw);
+    } catch {
+      handlers.onDropped({ bytes: Buffer.byteLength(raw, "utf8"), preview: preview(raw) });
+      return;
+    }
+    handlers.onMessage(msg);
+  };
+  socket.on("data", (chunk) => {
+    buf += typeof chunk === "string" ? chunk : chunk.toString("utf8");
+    let nl;
+    while ((nl = buf.indexOf("\n")) !== -1) {
+      const raw = buf.slice(0, nl);
+      buf = buf.slice(nl + 1);
+      deliver(raw);
+    }
+  });
+  socket.on("end", () => {
+    const rest = buf;
+    buf = "";
+    if (rest.length > 0) deliver(rest);
+  });
+}
+
+// ../tool-server/src/blueprints/ax-service.ts
 init_src();
 
 // ../tool-server/src/utils/ios-host.ts
@@ -96240,37 +96283,33 @@ var axServiceBlueprint = {
         daemonSocket.destroy();
       }
       daemonSocket = socket;
-      const rl = readline.createInterface({ input: socket });
-      rl.on("line", (raw) => {
-        let msg;
-        try {
-          msg = JSON.parse(raw);
-        } catch {
-          return;
-        }
-        if (typeof msg.id !== "number") return;
-        const pending = pendingRpc.get(msg.id);
-        if (!pending) return;
-        pendingRpc.delete(msg.id);
-        clearTimeout(pending.timer);
-        if (msg.error !== void 0 && msg.error !== null) {
-          pending.reject(
-            new FailureError(
-              typeof msg.error === "string" ? msg.error : JSON.stringify(msg.error),
-              {
-                error_code: FAILURE_CODES.AX_QUERY_FAILED,
-                failure_stage: "ax_service_query_rpc",
-                failure_area: "tool_server",
-                error_kind: "unknown"
-              }
-            )
-          );
-        } else {
-          pending.resolve(msg.result);
+      attachNdjsonReader(socket, {
+        onDropped: reportDroppedFrameToStderr(`ax-service ${udid.slice(0, 8)}`),
+        onMessage: (parsed) => {
+          const msg = parsed;
+          if (typeof msg.id !== "number") return;
+          const pending = pendingRpc.get(msg.id);
+          if (!pending) return;
+          pendingRpc.delete(msg.id);
+          clearTimeout(pending.timer);
+          if (msg.error !== void 0 && msg.error !== null) {
+            pending.reject(
+              new FailureError(
+                typeof msg.error === "string" ? msg.error : JSON.stringify(msg.error),
+                {
+                  error_code: FAILURE_CODES.AX_QUERY_FAILED,
+                  failure_stage: "ax_service_query_rpc",
+                  failure_area: "tool_server",
+                  error_kind: "unknown"
+                }
+              )
+            );
+          } else {
+            pending.resolve(msg.result);
+          }
         }
       });
       socket.on("close", () => {
-        rl.close();
         if (daemonSocket === socket) {
           daemonSocket = null;
           if (!disposed) {
@@ -106592,7 +106631,7 @@ async function spawnSimulatorServerProcess(udid, subcommand) {
     let settled = false;
     const STREAM_GRACE_MS = 500;
     let apiReadyTimer = null;
-    const rl = readline2.createInterface({ input: proc.stdout });
+    const rl = readline.createInterface({ input: proc.stdout });
     const settle = (fn, cleanup) => {
       if (settled) return;
       settled = true;
@@ -109240,7 +109279,6 @@ var variantProposalStore = new VariantProposalStore();
 // ../tool-server/src/blueprints/native-devtools.ts
 var net2 = __toESM(require("node:net"));
 var fs18 = __toESM(require("node:fs"));
-var readline3 = __toESM(require("node:readline"));
 init_src();
 var NATIVE_DEVTOOLS_NAMESPACE = "NativeDevtools";
 function isInjectableBundleId(bundleId) {
@@ -109507,67 +109545,63 @@ var nativeDevtoolsBlueprint = {
     }
     const server = net2.createServer((socket) => {
       let bundleId = null;
-      const rl = readline3.createInterface({ input: socket });
-      rl.on("line", (raw) => {
-        let msg;
-        try {
-          msg = JSON.parse(raw);
-        } catch {
-          return;
-        }
-        if (bundleId === null) {
-          if (msg.type !== "Control") return;
-          bundleId = msg.payload.bundleId;
-          const existing = connections2.get(bundleId);
-          if (existing) {
-            existing.socket.destroy();
-          }
-          connections2.set(bundleId, { socket, networkLog: [] });
-          if (activatedBundleIds.has(bundleId)) {
-            socket.write(
-              JSON.stringify({
-                type: "Control",
-                payload: { command: "activateNetworkInspection" }
-              }) + "\n"
-            );
+      attachNdjsonReader(socket, {
+        onDropped: reportDroppedFrameToStderr(`native-devtools ${udid.slice(0, 8)}`),
+        onMessage: (parsed) => {
+          const msg = parsed;
+          if (bundleId === null) {
+            if (msg.type !== "Control") return;
+            bundleId = msg.payload.bundleId;
+            const existing = connections2.get(bundleId);
+            if (existing) {
+              existing.socket.destroy();
+            }
+            connections2.set(bundleId, { socket, networkLog: [] });
+            if (activatedBundleIds.has(bundleId)) {
+              socket.write(
+                JSON.stringify({
+                  type: "Control",
+                  payload: { command: "activateNetworkInspection" }
+                }) + "\n"
+              );
+            }
+            return;
           }
-          return;
-        }
-        if (msg.type === "CDP") {
-          const p = msg.payload;
-          if (p.method && p.id === void 0) {
-            const conn = connections2.get(bundleId);
-            if (conn) {
-              if (conn.networkLog.length >= MAX_LOG_ENTRIES) {
-                conn.networkLog.shift();
+          if (msg.type === "CDP") {
+            const p = msg.payload;
+            if (p.method && p.id === void 0) {
+              const conn = connections2.get(bundleId);
+              if (conn) {
+                if (conn.networkLog.length >= MAX_LOG_ENTRIES) {
+                  conn.networkLog.shift();
+                }
+                conn.networkLog.push({
+                  method: p.method,
+                  params: p.params,
+                  timestamp: Date.now()
+                });
               }
-              conn.networkLog.push({
-                method: p.method,
-                params: p.params,
-                timestamp: Date.now()
-              });
             }
           }
-        }
-        if (msg.type === "ViewInspector") {
-          const p = msg.payload;
-          const pending = pendingRpc.get(p.id);
-          if (!pending) return;
-          pendingRpc.delete(p.id);
-          if (p.error) {
-            pending.reject(
-              new FailureError(p.error.message, {
-                error_code: FAILURE_CODES.NATIVE_DEVTOOLS_RPC_ERROR,
-                failure_stage: "native_devtools_rpc_response",
-                failure_area: "tool_server",
-                error_kind: "subprocess"
-              })
-            );
-          } else pending.resolve(p.result);
+          if (msg.type === "ViewInspector") {
+            const p = msg.payload;
+            const pending = pendingRpc.get(p.id);
+            if (!pending) return;
+            pendingRpc.delete(p.id);
+            if (p.error) {
+              pending.reject(
+                new FailureError(p.error.message, {
+                  error_code: FAILURE_CODES.NATIVE_DEVTOOLS_RPC_ERROR,
+                  failure_stage: "native_devtools_rpc_response",
+                  failure_area: "tool_server",
+                  error_kind: "subprocess"
+                })
+              );
+            } else pending.resolve(p.result);
+          }
         }
       });
       socket.on("close", () => {
-        rl.close();
         if (bundleId !== null) {
           if (connections2.get(bundleId)?.socket === socket) {
             connections2.delete(bundleId);
@@ -110011,22 +110045,28 @@ async function describeIos(registry2, device, params, options = {}) {
   if (isTvOs) {
     return { tree: emptyTree(), source: "ax-service", hint: TVOS_HINT };
   }
-  let tree;
+  let tree = emptyTree();
   let degraded;
   let resolverHint;
+  let readFailureHint;
+  let axApi;
   try {
     const axRef = axServiceRef(device);
-    const axApi = await registry2.resolveService(axRef.urn, axRef.options);
-    const response = await axApi.describe();
-    tree = adaptAXDescribeToDescribeResult(response);
+    axApi = await registry2.resolveService(axRef.urn, axRef.options);
     degraded = axApi.degraded;
   } catch (err) {
-    tree = emptyTree();
     resolverHint = tcpArtifactHint(err);
     degraded = resolverHint === void 0;
   }
+  if (axApi) {
+    try {
+      tree = adaptAXDescribeToDescribeResult(await axApi.describe());
+    } catch (err) {
+      readFailureHint = `The accessibility read failed (${errMsg(err)}).`;
+    }
+  }
   const degradedHint = !degraded ? void 0 : tree.children.length === 0 ? DEGRADED_BLIND_HINT : DEGRADED_STANDING_HINT;
-  const hint = resolverHint ?? degradedHint;
+  const hint = resolverHint ?? (readFailureHint ? degradedHint ? `${degradedHint}. ${readFailureHint}` : readFailureHint : degradedHint);
   if (tree.children.length > 0) {
     return { tree, source: "ax-service", hint };
   }
@@ -110518,7 +110558,7 @@ function parseUiAutomatorDump(rawOutput, screenW, screenH, options = {}) {
 
 // ../tool-server/src/blueprints/android-devtools.ts
 var import_node_child_process13 = require("node:child_process");
-var readline5 = __toESM(require("node:readline"));
+var readline2 = __toESM(require("node:readline"));
 init_src();
 
 // ../native-devtools-android/src/index.ts
@@ -110915,7 +110955,6 @@ async function ensureAndroidDevtoolsInstalled(serial) {
 
 // ../tool-server/src/utils/android-devtools-client.ts
 var net3 = __toESM(require("node:net"));
-var readline4 = __toESM(require("node:readline"));
 init_src();
 var DEFAULT_RPC_TIMEOUT_MS = 5e3;
 var LONG_RPC_TIMEOUT_MS = 15e3;
@@ -110949,36 +110988,32 @@ function connectAndroidDevtoolsClient(localPort, onTerminated) {
       onTerminated(error52);
     };
     socket.once("connect", () => {
-      const rl = readline4.createInterface({ input: socket });
-      rl.on("line", (line) => {
-        if (!line.trim()) return;
-        let parsed;
-        try {
-          parsed = JSON.parse(line);
-        } catch {
-          return;
-        }
-        if (typeof parsed.id !== "number") return;
-        const req = pending.get(parsed.id);
-        if (!req) return;
-        pending.delete(parsed.id);
-        clearTimeout(req.timer);
-        if (parsed.error) {
-          const message = parsed.error.message ?? "Unknown helper error";
-          const type = parsed.error.type ?? "HelperError";
-          req.reject(
-            new FailureError(`${type}: ${message}`, {
-              error_code: FAILURE_CODES.ANDROID_DEVTOOLS_RPC_ERROR,
-              failure_stage: "android_devtools_rpc_response",
-              failure_area: "tool_server",
-              error_kind: "subprocess"
-            })
-          );
-        } else {
-          req.resolve(parsed.result);
+      attachNdjsonReader(socket, {
+        onDropped: reportDroppedFrameToStderr("android-devtools"),
+        onMessage: (raw) => {
+          const parsed = raw;
+          if (typeof parsed.id !== "number") return;
+          const req = pending.get(parsed.id);
+          if (!req) return;
+          pending.delete(parsed.id);
+          clearTimeout(req.timer);
+          if (parsed.error) {
+            const message = parsed.error.message ?? "Unknown helper error";
+            const type = parsed.error.type ?? "HelperError";
+            req.reject(
+              new FailureError(`${type}: ${message}`, {
+                error_code: FAILURE_CODES.ANDROID_DEVTOOLS_RPC_ERROR,
+                failure_stage: "android_devtools_rpc_response",
+                failure_area: "tool_server",
+                error_kind: "subprocess"
+              })
+            );
+          } else {
+            req.resolve(parsed.result);
+          }
         }
       });
-      rl.on("close", () => cleanup());
+      socket.on("close", () => cleanup());
       resolve12({
         request(method, params = {}) {
           const send = () => {
@@ -111093,7 +111128,7 @@ async function spawnHelper(serial) {
       cleanup?.();
       fn();
     };
-    const rl = readline5.createInterface({ input: proc.stdout });
+    const rl = readline2.createInterface({ input: proc.stdout });
     rl.on("line", async (rawLine) => {
       const line = rawLine.trim();
       const portMatch = HELPER_PORT_MARKER.exec(line);

package/package.json

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