@swmansion/argent 0.26.1-next.15 → 0.26.1-next.16

package/dist/cli-cmds.mjs

@@ -1866,8 +1866,10 @@ async function killToolServer(bundlePath) {
 }
 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) {
+var PS_LOCALE = process.platform === "darwin" ? "en_US.UTF-8" : "C.UTF-8";
+function readProcessCommandLine(pid, flags2 = PS_WIDTH_FLAGS, env = { ...process.env, LC_ALL: PS_LOCALE }) {
   return execFileSync(PS_BIN, [...flags2, "-p", String(pid), "-o", "command="], {
+    env,
     encoding: "utf8",
     timeout: 2e3,
     // A recycled pid can sit on a process with an argv past Node's 1 MiB exec
@@ -1882,19 +1884,27 @@ function readProcessCommandLine(pid, flags2 = PS_WIDTH_FLAGS) {
 function couldBeOurToolServer(pid, marker) {
   if (!marker) return false;
   if (process.platform === "win32") return true;
-  let cmd;
-  try {
-    cmd = readProcessCommandLine(pid);
-  } catch (err) {
+  const escaped = marker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const ours = new RegExp(`(?:^|[\\t\\n\\v\\f\\r ])${escaped} start(?:[\\t\\n\\v\\f\\r ]|$)`);
+  const nonAscii = [...marker].some((c2) => c2.charCodeAt(0) > 127);
+  let failure;
+  for (const env of [void 0, process.env]) {
+    try {
+      if (ours.test(readProcessCommandLine(pid, PS_WIDTH_FLAGS, env))) return true;
+      failure = void 0;
+      if (!nonAscii) break;
+    } catch (err) {
+      failure = String(err);
+      if (err.code === "ETIMEDOUT") break;
+    }
+  }
+  if (failure !== void 0) {
     process.stderr.write(
-      `[launcher] ps could not read pid ${pid}'s command line; leaving it alone: ${String(err)}
+      `[launcher] ps could not read pid ${pid}'s command line; leaving it alone: ${failure}
 `
     );
-    return false;
   }
-  if (!cmd) return false;
-  const escaped = marker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  return new RegExp(`(?:^|\\s)${escaped} start(?:\\s|$)`).test(cmd);
+  return false;
 }
 var LOCK_WAIT_TIMEOUT_MS = 3e4;
 var LOCK_STALE_MS = 45e3;
@@ -21906,7 +21916,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.26.1-next.15";
+    return "0.26.1-next.16";
   }
   return "0.0.0";
 }

package/dist/client.js

@@ -1069,8 +1069,10 @@ async function killToolServer(bundlePath) {
 }
 var PS_BIN = ["/bin/ps", "/usr/bin/ps"].find((p) => fs4.existsSync(p)) ?? "ps";
 var PS_WIDTH_FLAGS = ["-ww"];
-function readProcessCommandLine(pid, flags = PS_WIDTH_FLAGS) {
+var PS_LOCALE = process.platform === "darwin" ? "en_US.UTF-8" : "C.UTF-8";
+function readProcessCommandLine(pid, flags = PS_WIDTH_FLAGS, env = { ...process.env, LC_ALL: PS_LOCALE }) {
   return execFileSync(PS_BIN, [...flags, "-p", String(pid), "-o", "command="], {
+    env,
     encoding: "utf8",
     timeout: 2e3,
     // A recycled pid can sit on a process with an argv past Node's 1 MiB exec
@@ -1085,19 +1087,27 @@ function readProcessCommandLine(pid, flags = PS_WIDTH_FLAGS) {
 function couldBeOurToolServer(pid, marker) {
   if (!marker) return false;
   if (process.platform === "win32") return true;
-  let cmd;
-  try {
-    cmd = readProcessCommandLine(pid);
-  } catch (err) {
+  const escaped = marker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const ours = new RegExp(`(?:^|[\\t\\n\\v\\f\\r ])${escaped} start(?:[\\t\\n\\v\\f\\r ]|$)`);
+  const nonAscii = [...marker].some((c) => c.charCodeAt(0) > 127);
+  let failure;
+  for (const env of [void 0, process.env]) {
+    try {
+      if (ours.test(readProcessCommandLine(pid, PS_WIDTH_FLAGS, env))) return true;
+      failure = void 0;
+      if (!nonAscii) break;
+    } catch (err) {
+      failure = String(err);
+      if (err.code === "ETIMEDOUT") break;
+    }
+  }
+  if (failure !== void 0) {
     process.stderr.write(
-      `[launcher] ps could not read pid ${pid}'s command line; leaving it alone: ${String(err)}
+      `[launcher] ps could not read pid ${pid}'s command line; leaving it alone: ${failure}
 `
     );
-    return false;
   }
-  if (!cmd) return false;
-  const escaped = marker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  return new RegExp(`(?:^|\\s)${escaped} start(?:\\s|$)`).test(cmd);
+  return false;
 }
 var LOCK_WAIT_TIMEOUT_MS = 3e4;
 var LOCK_STALE_MS = 45e3;

package/dist/installer.mjs

@@ -16730,7 +16730,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.26.1-next.15";
+    return "0.26.1-next.16";
   }
   return "0.0.0";
 }
@@ -23267,8 +23267,10 @@ async function killToolServerForInstallDir(packageDir) {
 }
 var PS_BIN = ["/bin/ps", "/usr/bin/ps"].find((p) => fs17.existsSync(p)) ?? "ps";
 var PS_WIDTH_FLAGS = ["-ww"];
-function readProcessCommandLine(pid, flags = PS_WIDTH_FLAGS) {
+var PS_LOCALE = process.platform === "darwin" ? "en_US.UTF-8" : "C.UTF-8";
+function readProcessCommandLine(pid, flags = PS_WIDTH_FLAGS, env = { ...process.env, LC_ALL: PS_LOCALE }) {
   return execFileSync5(PS_BIN, [...flags, "-p", String(pid), "-o", "command="], {
+    env,
     encoding: "utf8",
     timeout: 2e3,
     // A recycled pid can sit on a process with an argv past Node's 1 MiB exec
@@ -23283,19 +23285,27 @@ function readProcessCommandLine(pid, flags = PS_WIDTH_FLAGS) {
 function couldBeOurToolServer(pid, marker) {
   if (!marker) return false;
   if (process.platform === "win32") return true;
-  let cmd;
-  try {
-    cmd = readProcessCommandLine(pid);
-  } catch (err) {
+  const escaped = marker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const ours = new RegExp(`(?:^|[\\t\\n\\v\\f\\r ])${escaped} start(?:[\\t\\n\\v\\f\\r ]|$)`);
+  const nonAscii = [...marker].some((c2) => c2.charCodeAt(0) > 127);
+  let failure;
+  for (const env of [void 0, process.env]) {
+    try {
+      if (ours.test(readProcessCommandLine(pid, PS_WIDTH_FLAGS, env))) return true;
+      failure = void 0;
+      if (!nonAscii) break;
+    } catch (err) {
+      failure = String(err);
+      if (err.code === "ETIMEDOUT") break;
+    }
+  }
+  if (failure !== void 0) {
     process.stderr.write(
-      `[launcher] ps could not read pid ${pid}'s command line; leaving it alone: ${String(err)}
+      `[launcher] ps could not read pid ${pid}'s command line; leaving it alone: ${failure}
 `
     );
-    return false;
   }
-  if (!cmd) return false;
-  const escaped = marker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  return new RegExp(`(?:^|\\s)${escaped} start(?:\\s|$)`).test(cmd);
+  return false;
 }
 
 // ../argent-tools-client/src/link-config.ts

package/dist/mcp-server.mjs

@@ -16104,8 +16104,10 @@ async function terminatePid(pid, stillOurs) {
 }
 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) {
+var PS_LOCALE = process.platform === "darwin" ? "en_US.UTF-8" : "C.UTF-8";
+function readProcessCommandLine(pid, flags = PS_WIDTH_FLAGS, env = { ...process.env, LC_ALL: PS_LOCALE }) {
   return execFileSync(PS_BIN, [...flags, "-p", String(pid), "-o", "command="], {
+    env,
     encoding: "utf8",
     timeout: 2e3,
     // A recycled pid can sit on a process with an argv past Node's 1 MiB exec
@@ -16120,19 +16122,27 @@ function readProcessCommandLine(pid, flags = PS_WIDTH_FLAGS) {
 function couldBeOurToolServer(pid, marker) {
   if (!marker) return false;
   if (process.platform === "win32") return true;
-  let cmd;
-  try {
-    cmd = readProcessCommandLine(pid);
-  } catch (err) {
+  const escaped = marker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const ours = new RegExp(`(?:^|[\\t\\n\\v\\f\\r ])${escaped} start(?:[\\t\\n\\v\\f\\r ]|$)`);
+  const nonAscii = [...marker].some((c) => c.charCodeAt(0) > 127);
+  let failure;
+  for (const env of [void 0, process.env]) {
+    try {
+      if (ours.test(readProcessCommandLine(pid, PS_WIDTH_FLAGS, env))) return true;
+      failure = void 0;
+      if (!nonAscii) break;
+    } catch (err) {
+      failure = String(err);
+      if (err.code === "ETIMEDOUT") break;
+    }
+  }
+  if (failure !== void 0) {
     process.stderr.write(
-      `[launcher] ps could not read pid ${pid}'s command line; leaving it alone: ${String(err)}
+      `[launcher] ps could not read pid ${pid}'s command line; leaving it alone: ${failure}
 `
     );
-    return false;
   }
-  if (!cmd) return false;
-  const escaped = marker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  return new RegExp(`(?:^|\\s)${escaped} start(?:\\s|$)`).test(cmd);
+  return false;
 }
 var LOCK_WAIT_TIMEOUT_MS = 3e4;
 var LOCK_STALE_MS = 45e3;

package/dist/tool-server.cjs

@@ -94814,7 +94814,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.26.1-next.15";
+    return "0.26.1-next.16";
   }
   return "0.0.0";
 }
@@ -96174,7 +96174,7 @@ var import_node_path6 = __toESM(require("node:path"));
 var import_semver2 = __toESM(require_semver2());
 
 // ../tool-server/package.json
-var version2 = "0.26.0";
+var version2 = "0.27.0";
 
 // ../tool-server/src/utils/update-checker.ts
 var import_update_core = __toESM(require_dist4());

package/package.json

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