@swmansion/argent 0.16.1-next.6 → 0.16.1-next.8

package/dist/tool-server.cjs

@@ -105217,7 +105217,7 @@ async function shutdown(timeoutMs = SHORT_FLUSH_TIMEOUT_MS) {
 // ../tool-server/src/http.ts
 var import_express3 = __toESM(require_express2());
 var import_bytes2 = __toESM(require_bytes());
-var import_node_fs10 = require("node:fs");
+var import_node_fs11 = require("node:fs");
 var import_promises9 = require("node:fs/promises");
 var import_node_os8 = require("node:os");
 var import_node_path9 = require("node:path");
@@ -105268,7 +105268,7 @@ init_android_binary();
 // ../tool-server/src/utils/vega-cli.ts
 var import_node_child_process4 = require("node:child_process");
 var import_node_util3 = require("node:util");
-var import_node_fs4 = require("node:fs");
+var import_node_fs5 = require("node:fs");
 var import_promises3 = require("node:fs/promises");
 var import_node_os3 = require("node:os");
 var import_node_path3 = require("node:path");
@@ -105278,7 +105278,9 @@ init_subprocess_error();
 // ../tool-server/src/utils/vega-process.ts
 var import_node_child_process3 = require("node:child_process");
 var import_node_util2 = require("node:util");
+var import_node_fs4 = require("node:fs");
 var execFileAsync2 = (0, import_node_util2.promisify)(import_node_child_process3.execFile);
+var PS_BIN = ["/bin/ps", "/usr/bin/ps"].find((p) => (0, import_node_fs4.existsSync)(p)) ?? "ps";
 var PS_ARGS = ["-A", "-ww", "-o", "command="];
 var PS_ARGS_WITH_PID = ["-A", "-ww", "-o", "pid=,command="];
 var VVD_PROCESS_RE = /(?:^|\/)(?:vega|kepler)-virtual-device(?:\s|$)/;
@@ -105312,7 +105314,7 @@ function parseVvdPids(psOutput) {
 }
 async function listRunningVvdConsolePorts() {
   try {
-    const { stdout } = await execFileAsync2("ps", [...PS_ARGS], {
+    const { stdout } = await execFileAsync2(PS_BIN, [...PS_ARGS], {
       timeout: VVD_PS_PROBE_TIMEOUT_MS,
       maxBuffer: 16 * 1024 * 1024
     });
@@ -105327,7 +105329,7 @@ async function listRunningVvdConsolePorts() {
 }
 async function listRunningVvdPids() {
   try {
-    const { stdout } = await execFileAsync2("ps", [...PS_ARGS_WITH_PID], {
+    const { stdout } = await execFileAsync2(PS_BIN, [...PS_ARGS_WITH_PID], {
       timeout: 5e3,
       maxBuffer: 16 * 1024 * 1024
     });
@@ -105347,7 +105349,7 @@ var VEGA_BINARY_TTL_MS = 6e4;
 var cachedVegaBinary;
 async function isExecutable(p) {
   try {
-    await (0, import_promises3.access)(p, import_node_fs4.constants.X_OK);
+    await (0, import_promises3.access)(p, import_node_fs5.constants.X_OK);
     return true;
   } catch {
     return false;
@@ -105410,10 +105412,15 @@ async function reapVegaGroup(child) {
   }
 }
 async function collectDescendantPids(rootPid) {
-  const { stdout } = await execFileAsync3("ps", ["-A", "-o", "pid=,ppid="], {
-    timeout: 1500,
-    maxBuffer: 16 * 1024 * 1024
-  });
+  let stdout;
+  try {
+    ({ stdout } = await execFileAsync3(PS_BIN, ["-A", "-o", "pid=,ppid="], {
+      timeout: 1500,
+      maxBuffer: 16 * 1024 * 1024
+    }));
+  } catch {
+    return [];
+  }
   const childrenByParent = /* @__PURE__ */ new Map();
   for (const line of stdout.split("\n")) {
     const m = line.trim().match(/^(\d+)\s+(\d+)$/);
@@ -105439,10 +105446,15 @@ async function collectDescendantPids(rootPid) {
   return descendants;
 }
 async function pgidMembers(pgid) {
-  const { stdout } = await execFileAsync3("ps", ["-A", "-o", "pid=,pgid="], {
-    timeout: 1500,
-    maxBuffer: 16 * 1024 * 1024
-  });
+  let stdout;
+  try {
+    ({ stdout } = await execFileAsync3(PS_BIN, ["-A", "-o", "pid=,pgid="], {
+      timeout: 1500,
+      maxBuffer: 16 * 1024 * 1024
+    }));
+  } catch {
+    return [];
+  }
   const members = [];
   for (const line of stdout.split("\n")) {
     const m = line.trim().match(/^(\d+)\s+(\d+)$/);
@@ -105467,7 +105479,7 @@ async function reapLingeringGroupMembers(pid) {
   } catch {
   }
 }
-function resolveSpawnCwd(getCwd = () => process.cwd(), dirExists = import_node_fs4.existsSync, fallback = (0, import_node_os3.tmpdir)()) {
+function resolveSpawnCwd(getCwd = () => process.cwd(), dirExists = import_node_fs5.existsSync, fallback = (0, import_node_os3.tmpdir)()) {
   try {
     const cwd = getCwd();
     if (dirExists(cwd)) return cwd;
@@ -105758,7 +105770,7 @@ function toSimulatorNetworkError(toolLabel, err, apiUrl, fallbackHint) {
 }
 
 // ../tool-server/src/utils/update-checker.ts
-var import_node_fs5 = __toESM(require("node:fs"));
+var import_node_fs6 = __toESM(require("node:fs"));
 var import_node_os4 = __toESM(require("node:os"));
 var import_node_path4 = __toESM(require("node:path"));
 var import_semver = __toESM(require_semver2());
@@ -105776,7 +105788,7 @@ function getSuppressionFilePath() {
 }
 function loadSuppressUntil() {
   try {
-    const raw = import_node_fs5.default.readFileSync(getSuppressionFilePath(), "utf8");
+    const raw = import_node_fs6.default.readFileSync(getSuppressionFilePath(), "utf8");
     const parsed = JSON.parse(raw);
     const value = parsed.suppressUntil;
     return typeof value === "number" && Number.isFinite(value) ? value : 0;
@@ -105786,8 +105798,8 @@ function loadSuppressUntil() {
 }
 function persistSuppressUntil(value) {
   const filePath = getSuppressionFilePath();
-  import_node_fs5.default.mkdirSync(import_node_path4.default.dirname(filePath), { recursive: true });
-  import_node_fs5.default.writeFileSync(filePath, JSON.stringify({ suppressUntil: value }));
+  import_node_fs6.default.mkdirSync(import_node_path4.default.dirname(filePath), { recursive: true });
+  import_node_fs6.default.writeFileSync(filePath, JSON.stringify({ suppressUntil: value }));
 }
 var state2 = {
   updateAvailable: false,
@@ -105879,7 +105891,7 @@ ACTION REQUIRED: Save a note (via TODO, task list) that an Argent update to v${l
 }
 
 // ../tool-server/src/preview.ts
-var import_node_fs8 = __toESM(require("node:fs"));
+var import_node_fs9 = __toESM(require("node:fs"));
 var import_node_os6 = __toESM(require("node:os"));
 var import_node_path6 = __toESM(require("node:path"));
 var import_express = __toESM(require_express2());
@@ -105904,6 +105916,7 @@ var import_node_util8 = require("node:util");
 
 // ../tool-server/src/utils/simctl-config.ts
 var SIMCTL_SPAWN_TIMEOUT_MS = 1e4;
+var SIMCTL_KILL_SIGNAL = "SIGKILL";
 
 // ../tool-server/src/utils/ios-devices.ts
 var import_node_child_process6 = require("node:child_process");
@@ -105912,7 +105925,8 @@ var execFileAsync5 = (0, import_node_util5.promisify)(import_node_child_process6
 async function listIosSimulators() {
   try {
     const { stdout } = await execFileAsync5("xcrun", ["simctl", "list", "devices", "--json"], {
-      timeout: 1e4
+      timeout: 1e4,
+      killSignal: SIMCTL_KILL_SIGNAL
     });
     const data = JSON.parse(stdout);
     const out = [];
@@ -105974,7 +105988,7 @@ async function ensureAutomationEnabled(udid) {
       "-bool",
       "true"
     ],
-    { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
+    { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
   );
 }
 async function isEntitlementBypassActive(udid) {
@@ -105989,7 +106003,7 @@ async function isEntitlementBypassActive(udid) {
       "com.apple.Accessibility",
       "IgnoreAXServerEntitlements"
     ],
-    { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
+    { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
   ).then(({ stdout }) => stdout.trim() === "1").catch(() => false);
 }
 function accessibilityPlistPath(udid) {
@@ -106224,7 +106238,7 @@ async function ensureAccessibilityEnabled(udid) {
           "-bool",
           "true"
         ],
-        { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
+        { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
       )
     )
   );
@@ -106234,7 +106248,7 @@ async function setupNativeDevtoolsEnvLocal(udid, endpoint) {
   const result = await execFileAsync8(
     "xcrun",
     ["simctl", "spawn", udid, "launchctl", "getenv", "DYLD_INSERT_LIBRARIES"],
-    { encoding: "utf8", timeout: SIMCTL_SPAWN_TIMEOUT_MS }
+    { encoding: "utf8", timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
   ).catch((e) => ({ stdout: e.stdout ?? "" }));
   const existing = (result.stdout ?? "").trim();
   const updated = buildDyldInsertLibraries(existing, bootstrapPath);
@@ -106242,7 +106256,7 @@ async function setupNativeDevtoolsEnvLocal(udid, endpoint) {
     await execFileAsync8(
       "xcrun",
       ["simctl", "spawn", udid, "launchctl", "setenv", "DYLD_INSERT_LIBRARIES", updated],
-      { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
+      { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
     );
   }
   if (endpoint.transport === "tcp") {
@@ -106260,7 +106274,7 @@ async function setupNativeDevtoolsEnvLocal(udid, endpoint) {
         "NATIVE_DEVTOOLS_IOS_CDP_PORT",
         String(endpoint.port)
       ],
-      { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
+      { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
     );
   } else {
     await execFileAsync8(
@@ -106274,7 +106288,7 @@ async function setupNativeDevtoolsEnvLocal(udid, endpoint) {
         "NATIVE_DEVTOOLS_IOS_CDP_SOCKET",
         endpoint.socketPath
       ],
-      { timeout: SIMCTL_SPAWN_TIMEOUT_MS }
+      { timeout: SIMCTL_SPAWN_TIMEOUT_MS, killSignal: SIMCTL_KILL_SIGNAL }
     );
   }
   await ensureAccessibilityEnabled(udid);
@@ -106304,7 +106318,9 @@ function parseUIKitApplicationBundleIds(stdout) {
 }
 async function listRunningUIKitApplicationBundleIds(udid) {
   const { stdout } = await execFileAsync8("xcrun", ["simctl", "spawn", udid, "launchctl", "list"], {
-    encoding: "utf8"
+    encoding: "utf8",
+    timeout: SIMCTL_SPAWN_TIMEOUT_MS,
+    killSignal: SIMCTL_KILL_SIGNAL
   });
   return parseUIKitApplicationBundleIds(stdout);
 }
@@ -115922,7 +115938,7 @@ init_src();
 
 // ../tool-server/src/utils/vega-sdk.ts
 var import_promises4 = require("node:fs/promises");
-var import_node_fs6 = require("node:fs");
+var import_node_fs7 = require("node:fs");
 var import_node_os5 = require("node:os");
 var import_node_path5 = require("node:path");
 var import_semver2 = __toESM(require_semver2());
@@ -115945,7 +115961,7 @@ function sdkComponentRoots(config2) {
   return Array.from(new Set(roots));
 }
 async function resolveVersion(channelDir, preferred) {
-  if (preferred && (0, import_node_fs6.existsSync)((0, import_node_path5.join)(channelDir, preferred))) return preferred;
+  if (preferred && (0, import_node_fs7.existsSync)((0, import_node_path5.join)(channelDir, preferred))) return preferred;
   try {
     const versions = (await (0, import_promises4.readdir)(channelDir)).filter((e) => import_semver2.default.valid(e)).sort(import_semver2.default.rcompare);
     return versions[0] ?? null;
@@ -115963,7 +115979,7 @@ async function resolveVegaSdkImagesDir() {
     const version4 = await resolveVersion(channelDir, preferred);
     if (!version4) continue;
     const imagesDir = (0, import_node_path5.join)(channelDir, version4, "vvd", "images");
-    if ((0, import_node_fs6.existsSync)(imagesDir)) return imagesDir;
+    if ((0, import_node_fs7.existsSync)(imagesDir)) return imagesDir;
   }
   return null;
 }
@@ -117901,7 +117917,7 @@ var TraceProcessorUnavailableError = class _TraceProcessorUnavailableError exten
 };
 
 // ../native-devtools-android/src/wasm-trace-processor.ts
-var import_node_fs7 = require("node:fs");
+var import_node_fs8 = require("node:fs");
 var import_promises5 = require("node:fs/promises");
 var path13 = __toESM(require("node:path"));
 var import_node_url2 = require("node:url");
@@ -117916,7 +117932,7 @@ function engineGlobals() {
 function resolveTraceProcessorAssets() {
   const dir = path13.join(__dirname, "..", "assets", "trace-processor");
   const wasmOverride = process.env.ARGENT_TRACE_PROCESSOR_WASM;
-  if (wasmOverride && !(0, import_node_fs7.existsSync)(wasmOverride)) {
+  if (wasmOverride && !(0, import_node_fs8.existsSync)(wasmOverride)) {
     throw new TraceProcessorUnavailableError("wasm_path_invalid", { path: wasmOverride });
   }
   return {
@@ -118044,8 +118060,8 @@ async function createEngine() {
     setupWorkerScope(dir);
     silenceDecoderWarning();
     const g = engineGlobals();
-    g.__TP_WASM_BYTES = new Uint8Array((0, import_node_fs7.readFileSync)(wasmPath));
-    const src = patchGlueForNode((0, import_node_fs7.readFileSync)(gluePath, "utf8"));
+    g.__TP_WASM_BYTES = new Uint8Array((0, import_node_fs8.readFileSync)(wasmPath));
+    const src = patchGlueForNode((0, import_node_fs8.readFileSync)(gluePath, "utf8"));
     import_node_vm.default.runInThisContext(src, { filename: "engine_bundle.node.patched.js" });
     const bridge = g.__TP_bridge;
     if (!bridge) throw new Error("patched glue did not expose globalThis.__TP_bridge");
@@ -118730,7 +118746,7 @@ function findUiFile(name) {
     import_node_path6.default.resolve(__dirname, "..", "..", "ui", name)
   ];
   for (const p of candidates) {
-    if (import_node_fs8.default.existsSync(p)) return p;
+    if (import_node_fs9.default.existsSync(p)) return p;
   }
   return null;
 }
@@ -119053,7 +119069,7 @@ data: ${JSON.stringify(data)}
     const roots = /* @__PURE__ */ new Set();
     for (const r of [import_node_os6.default.tmpdir(), process.cwd(), "/tmp"]) {
       try {
-        roots.add(import_node_fs8.default.realpathSync(r));
+        roots.add(import_node_fs9.default.realpathSync(r));
       } catch {
       }
     }
@@ -119072,8 +119088,8 @@ data: ${JSON.stringify(data)}
     let real;
     let size;
     try {
-      real = import_node_fs8.default.realpathSync(src);
-      const st = import_node_fs8.default.statSync(real);
+      real = import_node_fs9.default.realpathSync(src);
+      const st = import_node_fs9.default.statSync(real);
       if (!st.isFile()) throw new Error("not a file");
       size = st.size;
     } catch {
@@ -119090,7 +119106,7 @@ data: ${JSON.stringify(data)}
     }
     res.set("Cache-Control", "no-store");
     res.type(mime);
-    import_node_fs8.default.createReadStream(real).on("error", () => {
+    import_node_fs9.default.createReadStream(real).on("error", () => {
       if (!res.headersSent) res.status(404).end();
     }).pipe(res);
   });
@@ -119142,7 +119158,7 @@ data: ${JSON.stringify(data)}
 }
 
 // ../tool-server/src/artifacts.ts
-var import_node_fs9 = require("node:fs");
+var import_node_fs10 = require("node:fs");
 var import_promises7 = require("node:fs/promises");
 var import_node_child_process15 = require("node:child_process");
 
@@ -119270,7 +119286,7 @@ function makeArtifactRoute(registry2) {
     res.setHeader("Content-Type", entry.mimeType);
     res.setHeader("Content-Disposition", `attachment; filename="${entry.filename}"`);
     if (entry.size > 0) res.setHeader("Content-Length", String(entry.size));
-    const stream = (0, import_node_fs9.createReadStream)(entry.path);
+    const stream = (0, import_node_fs10.createReadStream)(entry.path);
     stream.on("error", () => {
       if (!res.headersSent) res.status(500).json({ error: `Failed to read artifact "${id}"` });
       else res.destroy();
@@ -119937,7 +119953,7 @@ function createHttpApp(registry2, options) {
     }
     const id = (0, import_node_crypto6.randomUUID)();
     const tarPath = (0, import_node_path9.join)((0, import_node_os8.tmpdir)(), `argent-upload-${id}.tar.gz`);
-    const ws = (0, import_node_fs10.createWriteStream)(tarPath);
+    const ws = (0, import_node_fs11.createWriteStream)(tarPath);
     let received = 0;
     let released = false;
     const releaseInFlight = () => {
@@ -120275,15 +120291,15 @@ function createHttpApp(registry2, options) {
 
 // ../tool-server/src/event-log.ts
 var import_bunyan = __toESM(require_bunyan());
-var import_node_fs11 = require("node:fs");
+var import_node_fs12 = require("node:fs");
 var import_node_path10 = require("node:path");
 init_src();
 function createToolServerEventLog({
   filePath
 }) {
-  (0, import_node_fs11.mkdirSync)((0, import_node_path10.dirname)(filePath), { recursive: true });
-  (0, import_node_fs11.writeFileSync)(filePath, "");
-  const fileStream = (0, import_node_fs11.createWriteStream)(filePath, { flags: "a" });
+  (0, import_node_fs12.mkdirSync)((0, import_node_path10.dirname)(filePath), { recursive: true });
+  (0, import_node_fs12.writeFileSync)(filePath, "");
+  const fileStream = (0, import_node_fs12.createWriteStream)(filePath, { flags: "a" });
   let disposed = false;
   let disposePromise = null;
   let streamError = null;
@@ -139144,7 +139160,7 @@ var nativeProfilerSessionBlueprint = {
 var import_child_process4 = require("child_process");
 init_src();
 var import_fs9 = require("fs");
-var import_node_fs12 = require("node:fs");
+var import_node_fs13 = require("node:fs");
 var path22 = __toESM(require("path"));
 
 // ../tool-server/src/utils/ios-profiler/notify.ts
@@ -140793,7 +140809,7 @@ function resolveDefaultTemplatePath() {
     )
   ];
   for (const candidate of candidates) {
-    if ((0, import_node_fs12.existsSync)(candidate)) return candidate;
+    if ((0, import_node_fs13.existsSync)(candidate)) return candidate;
   }
   throw new FailureError(
     `Argent.tracetemplate not found. Looked in:

package/package.json

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