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

package/dist/cli-cmds.mjs

@@ -31617,6 +31617,18 @@ var CONFIG_SCHEMA = [
     merge: "prioritize-local",
     example: "~/Library/Android/sdk"
   },
+  {
+    key: "android.adbServerPort",
+    description: "Port of the adb server argent uses, for hosts that run Android devices on a server other than the default 5037 (a device pool with its own server, for example). Applies when the tool-server starts, to the tool-server and every adb and simulator-server it runs. `ANDROID_ADB_SERVER_PORT` or `ADB_SERVER_SOCKET` in the tool-server's environment still wins, as it does for adb itself.",
+    scopes: ["project", "global"],
+    parse: (raw) => {
+      const value = asPositiveInteger(raw);
+      return value !== void 0 && value < 65536 ? value : void 0;
+    },
+    expected: "a TCP port, 1-65535",
+    merge: "prioritize-local",
+    example: "5038"
+  },
   {
     key: "recordings.directory",
     description: "Directory where finished screen recordings (mp4) are saved on the client host. Absolute, `~`-prefixed, or relative to the project root (home dir when not in a project). Unset \u21D2 `.argent/recordings` under the project root.",
@@ -35594,7 +35606,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.31.1-next.2";
+    return "0.31.1-next.3";
   }
   return "0.0.0";
 }

package/dist/client.js

@@ -8064,6 +8064,18 @@ var CONFIG_SCHEMA = [
     merge: "prioritize-local",
     example: "~/Library/Android/sdk"
   },
+  {
+    key: "android.adbServerPort",
+    description: "Port of the adb server argent uses, for hosts that run Android devices on a server other than the default 5037 (a device pool with its own server, for example). Applies when the tool-server starts, to the tool-server and every adb and simulator-server it runs. `ANDROID_ADB_SERVER_PORT` or `ADB_SERVER_SOCKET` in the tool-server's environment still wins, as it does for adb itself.",
+    scopes: ["project", "global"],
+    parse: (raw) => {
+      const value = asPositiveInteger(raw);
+      return value !== void 0 && value < 65536 ? value : void 0;
+    },
+    expected: "a TCP port, 1-65535",
+    merge: "prioritize-local",
+    example: "5038"
+  },
   {
     key: "recordings.directory",
     description: "Directory where finished screen recordings (mp4) are saved on the client host. Absolute, `~`-prefixed, or relative to the project root (home dir when not in a project). Unset \u21D2 `.argent/recordings` under the project root.",

package/dist/installer.mjs

@@ -15432,6 +15432,18 @@ var CONFIG_SCHEMA = [
     merge: "prioritize-local",
     example: "~/Library/Android/sdk"
   },
+  {
+    key: "android.adbServerPort",
+    description: "Port of the adb server argent uses, for hosts that run Android devices on a server other than the default 5037 (a device pool with its own server, for example). Applies when the tool-server starts, to the tool-server and every adb and simulator-server it runs. `ANDROID_ADB_SERVER_PORT` or `ADB_SERVER_SOCKET` in the tool-server's environment still wins, as it does for adb itself.",
+    scopes: ["project", "global"],
+    parse: (raw) => {
+      const value = asPositiveInteger(raw);
+      return value !== void 0 && value < 65536 ? value : void 0;
+    },
+    expected: "a TCP port, 1-65535",
+    merge: "prioritize-local",
+    example: "5038"
+  },
   {
     key: "recordings.directory",
     description: "Directory where finished screen recordings (mp4) are saved on the client host. Absolute, `~`-prefixed, or relative to the project root (home dir when not in a project). Unset \u21D2 `.argent/recordings` under the project root.",
@@ -16900,7 +16912,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.31.1-next.2";
+    return "0.31.1-next.3";
   }
   return "0.0.0";
 }

package/dist/mcp-server.mjs

@@ -27090,6 +27090,18 @@ var CONFIG_SCHEMA = [
     merge: "prioritize-local",
     example: "~/Library/Android/sdk"
   },
+  {
+    key: "android.adbServerPort",
+    description: "Port of the adb server argent uses, for hosts that run Android devices on a server other than the default 5037 (a device pool with its own server, for example). Applies when the tool-server starts, to the tool-server and every adb and simulator-server it runs. `ANDROID_ADB_SERVER_PORT` or `ADB_SERVER_SOCKET` in the tool-server's environment still wins, as it does for adb itself.",
+    scopes: ["project", "global"],
+    parse: (raw) => {
+      const value = asPositiveInteger(raw);
+      return value !== void 0 && value < 65536 ? value : void 0;
+    },
+    expected: "a TCP port, 1-65535",
+    merge: "prioritize-local",
+    example: "5038"
+  },
   {
     key: "recordings.directory",
     description: "Directory where finished screen recordings (mp4) are saved on the client host. Absolute, `~`-prefixed, or relative to the project root (home dir when not in a project). Unset \u21D2 `.argent/recordings` under the project root.",

package/dist/tool-server.cjs

@@ -887,6 +887,18 @@ var init_config_schema = __esm({
         merge: "prioritize-local",
         example: "~/Library/Android/sdk"
       },
+      {
+        key: "android.adbServerPort",
+        description: "Port of the adb server argent uses, for hosts that run Android devices on a server other than the default 5037 (a device pool with its own server, for example). Applies when the tool-server starts, to the tool-server and every adb and simulator-server it runs. `ANDROID_ADB_SERVER_PORT` or `ADB_SERVER_SOCKET` in the tool-server's environment still wins, as it does for adb itself.",
+        scopes: ["project", "global"],
+        parse: (raw) => {
+          const value = asPositiveInteger(raw);
+          return value !== void 0 && value < 65536 ? value : void 0;
+        },
+        expected: "a TCP port, 1-65535",
+        merge: "prioritize-local",
+        example: "5038"
+      },
       {
         key: "recordings.directory",
         description: "Directory where finished screen recordings (mp4) are saved on the client host. Absolute, `~`-prefixed, or relative to the project root (home dir when not in a project). Unset \u21D2 `.argent/recordings` under the project root.",
@@ -961,6 +973,10 @@ function getAndroidSdkRoot(options = {}) {
   if (value.startsWith("~/")) return path4.resolve(home, value.slice(2));
   return path4.resolve(value);
 }
+function getAndroidAdbServerPort(options = {}) {
+  const value = getConfigValueByKey(ANDROID_ADB_SERVER_PORT_KEY, options);
+  return typeof value === "number" ? value : null;
+}
 function getAdditionalIosDeviceSets(options = {}) {
   const def = requireDefinition(IOS_ADDITIONAL_DEVICE_SETS_KEY);
   if (def.merge !== "union") {
@@ -985,7 +1001,7 @@ function resolveDeviceSetEntries(entries, baseDir, home) {
     return path4.resolve(baseDir, entry);
   });
 }
-var path4, UnknownConfigKeyError, ANDROID_SDK_ROOT_KEY, IOS_ADDITIONAL_DEVICE_SETS_KEY;
+var path4, UnknownConfigKeyError, ANDROID_SDK_ROOT_KEY, ANDROID_ADB_SERVER_PORT_KEY, IOS_ADDITIONAL_DEVICE_SETS_KEY;
 var init_config_access = __esm({
   "../configuration-core/src/config-access.ts"() {
     "use strict";
@@ -1004,6 +1020,7 @@ var init_config_access = __esm({
       key;
     };
     ANDROID_SDK_ROOT_KEY = "android.sdkRoot";
+    ANDROID_ADB_SERVER_PORT_KEY = "android.adbServerPort";
     IOS_ADDITIONAL_DEVICE_SETS_KEY = "ios.additionalDeviceSets";
   }
 });
@@ -100961,7 +100978,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.31.1-next.2";
+    return "0.31.1-next.3";
   }
   return "0.0.0";
 }
@@ -141108,6 +141125,10 @@ async function adbServerShell(serial, shellCommand, options = {}) {
     });
   });
 }
+function configuredAdbServerPort(env, configured) {
+  if (configured === null || env.ADB_SERVER_SOCKET || env.ANDROID_ADB_SERVER_PORT) return null;
+  return String(configured);
+}
 function adbServerAddress(env) {
   const socketSpec = env.ADB_SERVER_SOCKET;
   if (socketSpec) {
@@ -178549,6 +178570,12 @@ function initializeStdioTimestampWrapper() {
 }
 function start() {
   initializeStdioTimestampWrapper();
+  const adbServerPort = configuredAdbServerPort(process.env, getAndroidAdbServerPort());
+  if (adbServerPort !== null) {
+    process.env.ANDROID_ADB_SERVER_PORT = adbServerPort;
+    process.stderr.write(`android.adbServerPort \u2192 ANDROID_ADB_SERVER_PORT=${adbServerPort}
+`);
+  }
   let shuttingDown = false;
   let crashing = false;
   let finalExitCode = 0;

package/package.json

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