@swmansion/argent 0.23.1-next.0 → 0.23.1-next.1

package/dist/cli-cmds.mjs

@@ -1805,14 +1805,10 @@ async function sweepDeadStateFiles() {
       continue;
     }
     if (fs.existsSync(fresh.bundlePath)) continue;
-    const guarded = process.platform !== "win32";
-    if (guarded && !processCommandMatches(fresh.pid, fresh.bundlePath)) continue;
+    if (!couldBeOurToolServer(fresh.pid, fresh.bundlePath)) continue;
     await unlink(file).catch(() => {
     });
-    void terminatePid(
-      fresh.pid,
-      guarded ? () => processCommandMatches(fresh.pid, fresh.bundlePath) : void 0
-    );
+    void terminatePid(fresh.pid, () => couldBeOurToolServer(fresh.pid, fresh.bundlePath));
   }
 }
 var readState = readToolsServerState;
@@ -1851,20 +1847,37 @@ async function killToolServer(bundlePath) {
   await terminatePid(state2.pid);
   await clearToolsServerState(bundlePath ?? state2.bundlePath);
 }
-function processCommandMatches(pid, marker) {
+var PS_BIN = ["/bin/ps", "/usr/bin/ps"].find((p) => fs.existsSync(p)) ?? "ps";
+var PS_WIDTH_FLAGS = ["-ww"];
+function readProcessCommandLine(pid, flags2 = PS_WIDTH_FLAGS) {
+  return execFileSync(PS_BIN, [...flags2, "-p", String(pid), "-o", "command="], {
+    encoding: "utf8",
+    timeout: 2e3,
+    // A recycled pid can sit on a process with an argv past Node's 1 MiB exec
+    // default, where the overrun surfaces as ENOBUFS instead of a command line.
+    // Same ceiling as tool-server's vega-process ps probes.
+    maxBuffer: 16 * 1024 * 1024,
+    // Piping ps's stderr is what puts a rejected flag ("ps: invalid option --
+    // 'w'") into the thrown error's message.
+    stdio: ["ignore", "pipe", "pipe"]
+  }).trim();
+}
+function couldBeOurToolServer(pid, marker) {
   if (!marker) return false;
+  if (process.platform === "win32") return true;
+  let cmd;
   try {
-    const cmd = execFileSync("ps", ["-p", String(pid), "-o", "command="], {
-      encoding: "utf8",
-      timeout: 2e3,
-      stdio: ["ignore", "pipe", "ignore"]
-    }).trim();
-    if (!cmd) return false;
-    const escaped = marker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    return new RegExp(`(?:^|\\s)${escaped} start(?:\\s|$)`).test(cmd);
-  } catch {
+    cmd = readProcessCommandLine(pid);
+  } catch (err) {
+    process.stderr.write(
+      `[launcher] ps could not read pid ${pid}'s command line; leaving it alone: ${String(err)}
+`
+    );
     return false;
   }
+  if (!cmd) return false;
+  const escaped = marker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return new RegExp(`(?:^|\\s)${escaped} start(?:\\s|$)`).test(cmd);
 }
 var LOCK_WAIT_TIMEOUT_MS = 3e4;
 var LOCK_STALE_MS = 45e3;
@@ -1953,8 +1966,8 @@ async function ensureToolsServer(paths) {
     const state2 = await readState(paths.bundlePath);
     const reuse = await reusableHandle(state2, paths.bundlePath, paths.version);
     if (reuse) return reuse;
-    if (state2 && state2.managed === "autospawn" && state2.bundlePath === paths.bundlePath && isProcessAlive(state2.pid) && processCommandMatches(state2.pid, state2.bundlePath)) {
-      await terminatePid(state2.pid, () => processCommandMatches(state2.pid, state2.bundlePath));
+    if (state2 && state2.managed === "autospawn" && state2.bundlePath === paths.bundlePath && isProcessAlive(state2.pid) && couldBeOurToolServer(state2.pid, state2.bundlePath)) {
+      await terminatePid(state2.pid, () => couldBeOurToolServer(state2.pid, state2.bundlePath));
     }
     await clearToolsServerState(paths.bundlePath);
     await sweepDeadStateFiles();
@@ -7240,7 +7253,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.23.1-next.0";
+    return "0.23.1-next.1";
   }
   return "0.0.0";
 }

package/dist/installer.mjs

@@ -16625,7 +16625,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.23.1-next.0";
+    return "0.23.1-next.1";
   }
   return "0.0.0";
 }
@@ -23046,15 +23046,11 @@ async function killToolServerForInstallDir(packageDir) {
     const fresh = await readStateFile(file);
     if (!fresh || fresh.pid !== state2.pid || fresh.bundlePath !== state2.bundlePath) continue;
     const alive = isProcessAlive(fresh.pid);
-    const guarded = process.platform !== "win32";
-    if (alive && guarded && !processCommandMatches(fresh.pid, fresh.bundlePath)) {
+    if (alive && !couldBeOurToolServer(fresh.pid, fresh.bundlePath)) {
       continue;
     }
     if (alive) {
-      await terminatePid(
-        fresh.pid,
-        guarded ? () => processCommandMatches(fresh.pid, fresh.bundlePath) : void 0
-      );
+      await terminatePid(fresh.pid, () => couldBeOurToolServer(fresh.pid, fresh.bundlePath));
     }
     await unlink(file).catch(() => {
     });
@@ -23062,20 +23058,37 @@ async function killToolServerForInstallDir(packageDir) {
   }
   return killed;
 }
-function processCommandMatches(pid, marker) {
+var PS_BIN = ["/bin/ps", "/usr/bin/ps"].find((p) => fs16.existsSync(p)) ?? "ps";
+var PS_WIDTH_FLAGS = ["-ww"];
+function readProcessCommandLine(pid, flags = PS_WIDTH_FLAGS) {
+  return execFileSync5(PS_BIN, [...flags, "-p", String(pid), "-o", "command="], {
+    encoding: "utf8",
+    timeout: 2e3,
+    // A recycled pid can sit on a process with an argv past Node's 1 MiB exec
+    // default, where the overrun surfaces as ENOBUFS instead of a command line.
+    // Same ceiling as tool-server's vega-process ps probes.
+    maxBuffer: 16 * 1024 * 1024,
+    // Piping ps's stderr is what puts a rejected flag ("ps: invalid option --
+    // 'w'") into the thrown error's message.
+    stdio: ["ignore", "pipe", "pipe"]
+  }).trim();
+}
+function couldBeOurToolServer(pid, marker) {
   if (!marker) return false;
+  if (process.platform === "win32") return true;
+  let cmd;
   try {
-    const cmd = execFileSync5("ps", ["-p", String(pid), "-o", "command="], {
-      encoding: "utf8",
-      timeout: 2e3,
-      stdio: ["ignore", "pipe", "ignore"]
-    }).trim();
-    if (!cmd) return false;
-    const escaped = marker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    return new RegExp(`(?:^|\\s)${escaped} start(?:\\s|$)`).test(cmd);
-  } catch {
+    cmd = readProcessCommandLine(pid);
+  } catch (err) {
+    process.stderr.write(
+      `[launcher] ps could not read pid ${pid}'s command line; leaving it alone: ${String(err)}
+`
+    );
     return false;
   }
+  if (!cmd) return false;
+  const escaped = marker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return new RegExp(`(?:^|\\s)${escaped} start(?:\\s|$)`).test(cmd);
 }
 
 // ../argent-tools-client/src/link-config.ts

package/dist/mcp-server.mjs

@@ -16057,14 +16057,10 @@ async function sweepDeadStateFiles() {
       continue;
     }
     if (fs.existsSync(fresh.bundlePath)) continue;
-    const guarded = process.platform !== "win32";
-    if (guarded && !processCommandMatches(fresh.pid, fresh.bundlePath)) continue;
+    if (!couldBeOurToolServer(fresh.pid, fresh.bundlePath)) continue;
     await unlink(file).catch(() => {
     });
-    void terminatePid(
-      fresh.pid,
-      guarded ? () => processCommandMatches(fresh.pid, fresh.bundlePath) : void 0
-    );
+    void terminatePid(fresh.pid, () => couldBeOurToolServer(fresh.pid, fresh.bundlePath));
   }
 }
 var readState = readToolsServerState;
@@ -16097,20 +16093,37 @@ async function terminatePid(pid, stillOurs) {
   }
   await waitForExit(pid, SIGKILL_GRACE_MS);
 }
-function processCommandMatches(pid, marker) {
+var PS_BIN = ["/bin/ps", "/usr/bin/ps"].find((p) => fs.existsSync(p)) ?? "ps";
+var PS_WIDTH_FLAGS = ["-ww"];
+function readProcessCommandLine(pid, flags = PS_WIDTH_FLAGS) {
+  return execFileSync(PS_BIN, [...flags, "-p", String(pid), "-o", "command="], {
+    encoding: "utf8",
+    timeout: 2e3,
+    // A recycled pid can sit on a process with an argv past Node's 1 MiB exec
+    // default, where the overrun surfaces as ENOBUFS instead of a command line.
+    // Same ceiling as tool-server's vega-process ps probes.
+    maxBuffer: 16 * 1024 * 1024,
+    // Piping ps's stderr is what puts a rejected flag ("ps: invalid option --
+    // 'w'") into the thrown error's message.
+    stdio: ["ignore", "pipe", "pipe"]
+  }).trim();
+}
+function couldBeOurToolServer(pid, marker) {
   if (!marker) return false;
+  if (process.platform === "win32") return true;
+  let cmd;
   try {
-    const cmd = execFileSync("ps", ["-p", String(pid), "-o", "command="], {
-      encoding: "utf8",
-      timeout: 2e3,
-      stdio: ["ignore", "pipe", "ignore"]
-    }).trim();
-    if (!cmd) return false;
-    const escaped = marker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    return new RegExp(`(?:^|\\s)${escaped} start(?:\\s|$)`).test(cmd);
-  } catch {
+    cmd = readProcessCommandLine(pid);
+  } catch (err) {
+    process.stderr.write(
+      `[launcher] ps could not read pid ${pid}'s command line; leaving it alone: ${String(err)}
+`
+    );
     return false;
   }
+  if (!cmd) return false;
+  const escaped = marker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return new RegExp(`(?:^|\\s)${escaped} start(?:\\s|$)`).test(cmd);
 }
 var LOCK_WAIT_TIMEOUT_MS = 3e4;
 var LOCK_STALE_MS = 45e3;
@@ -16199,8 +16212,8 @@ async function ensureToolsServer(paths) {
     const state = await readState(paths.bundlePath);
     const reuse = await reusableHandle(state, paths.bundlePath, paths.version);
     if (reuse) return reuse;
-    if (state && state.managed === "autospawn" && state.bundlePath === paths.bundlePath && isProcessAlive(state.pid) && processCommandMatches(state.pid, state.bundlePath)) {
-      await terminatePid(state.pid, () => processCommandMatches(state.pid, state.bundlePath));
+    if (state && state.managed === "autospawn" && state.bundlePath === paths.bundlePath && isProcessAlive(state.pid) && couldBeOurToolServer(state.pid, state.bundlePath)) {
+      await terminatePid(state.pid, () => couldBeOurToolServer(state.pid, state.bundlePath));
     }
     await clearToolsServerState(paths.bundlePath);
     await sweepDeadStateFiles();

package/dist/tool-server.cjs

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

package/package.json

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