@swmansion/argent 0.31.1-next.1 → 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.1";
+    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.1";
+    return "0.31.1-next.3";
   }
   return "0.0.0";
 }
@@ -17545,6 +17557,7 @@ var NPM_REGISTRY = "https://registry.npmjs.org";
 var MCP_SERVER_KEY = "argent";
 var MCP_BINARY_NAME = "argent";
 var PERMISSION_RULE = "mcp__argent";
+var DEVIN_PERMISSION_RULE = "mcp__argent__*";
 var CURSOR_ALLOWLIST_PATTERN = "argent:*";
 
 // ../argent-installer/src/utils.ts
@@ -21179,8 +21192,17 @@ function vscodeUserDirs() {
   }
   return dirs;
 }
+function devinUserConfigPath() {
+  if (process.platform === "win32") {
+    const appData = process.env.APPDATA || path18.join(homedir4(), "AppData", "Roaming");
+    return path18.join(appData, "devin", "config.json");
+  }
+  const xdg = process.env.XDG_CONFIG_HOME;
+  return path18.join(xdg || path18.join(homedir4(), ".config"), "devin", "config.json");
+}
 var windsurfAdapter = {
-  name: "Windsurf",
+  name: "Devin Desktop",
+  telemetryName: "windsurf",
   detect() {
     return dirHasEditorEvidence(
       path18.join(homedir4(), ".codeium", "windsurf"),
@@ -21219,16 +21241,19 @@ var windsurfAdapter = {
     return this.getArgentEntry(configPath) !== null;
   },
   // Targets just the argent entry's alwaysAllow key, so comments and foreign
-  // servers survive.
+  // servers survive. alwaysAllow serves the legacy Cascade agent; the Devin
+  // agent needs its own permission rule.
   addAllowlist() {
     const configPath = path18.join(homedir4(), ".codeium", "windsurf", "mcp_config.json");
     const config = readJsonc(configPath);
     const servers = config.mcpServers;
     if (!servers?.[MCP_SERVER_KEY]) return;
     editJsoncFile(configPath, ["mcpServers", MCP_SERVER_KEY, "alwaysAllow"], ["*"]);
+    addAllowRule(devinUserConfigPath(), DEVIN_PERMISSION_RULE);
   },
   removeAllowlist(_root, scope) {
     if (scope !== "global") return;
+    removeAllowRule(devinUserConfigPath(), DEVIN_PERMISSION_RULE);
     const configPath = path18.join(homedir4(), ".codeium", "windsurf", "mcp_config.json");
     if (!fs17.existsSync(configPath)) return;
     const config = readJsonc(configPath);
@@ -21651,25 +21676,32 @@ function findConfiguredAdapterScopes(adapters, projectRoot) {
   }
   return results;
 }
-function addClaudePermission(root, scope) {
-  const settingsPath = scope === "global" ? path18.join(homedir4(), ".claude", "settings.json") : path18.join(root, ".claude", "settings.json");
+function addAllowRule(settingsPath, rule) {
   const config = readJsonc(settingsPath);
   const permissions = config.permissions ?? {};
   const allow = Array.isArray(permissions.allow) ? permissions.allow : [];
-  if (allow.includes(PERMISSION_RULE)) return;
-  editJsoncFile(settingsPath, ["permissions", "allow"], [...allow, PERMISSION_RULE]);
+  if (allow.includes(rule)) return;
+  editJsoncFile(settingsPath, ["permissions", "allow"], [...allow, rule]);
 }
-function removeClaudePermission(root, scope) {
-  const settingsPath = scope === "global" ? path18.join(homedir4(), ".claude", "settings.json") : path18.join(root, ".claude", "settings.json");
+function removeAllowRule(settingsPath, rule) {
   if (!fs17.existsSync(settingsPath)) return;
   const config = readJsonc(settingsPath);
   const permissions = config?.permissions;
   const allow = permissions?.allow;
   if (!permissions || !Array.isArray(allow)) return;
-  if (!allow.includes(PERMISSION_RULE)) return;
-  const next = allow.filter((rule) => rule !== PERMISSION_RULE);
+  if (!allow.includes(rule)) return;
+  const next = allow.filter((r2) => r2 !== rule);
   editJsoncFile(settingsPath, ["permissions", "allow"], next.length > 0 ? next : void 0);
 }
+function claudeSettingsPath(root, scope) {
+  return scope === "global" ? path18.join(homedir4(), ".claude", "settings.json") : path18.join(root, ".claude", "settings.json");
+}
+function addClaudePermission(root, scope) {
+  addAllowRule(claudeSettingsPath(root, scope), PERMISSION_RULE);
+}
+function removeClaudePermission(root, scope) {
+  removeAllowRule(claudeSettingsPath(root, scope), PERMISSION_RULE);
+}
 function formatCopyDestination(target, writtenPath, root) {
   if (writtenPath === target.targetPath) return target.label;
   return `${target.label} -> ${formatManagedPathLabel(writtenPath, realpathOrSelf(root))}`;
@@ -23268,7 +23300,7 @@ async function init2(args) {
     });
     tel.editorsConfiguredCount = writtenAdapters.length;
     track("installation:editors_select", {
-      editors: writtenAdapters.map((a2) => sanitizeEditorName(a2.name)),
+      editors: writtenAdapters.map((a2) => a2.telemetryName ?? sanitizeEditorName(a2.name)),
       detected_editor_count: detected.length,
       scope,
       install_mode: tel.installMode

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.",
@@ -27493,13 +27505,14 @@ var RUNTIME_CLIENT_PATTERNS = [
   [/^opencode\b/, "opencode"],
   [/^github-copilot-developer\b/, "copilot"]
 ];
-function canonicalizeAiClient(value) {
+function canonicalizeAiClient(value, env = {}) {
   if (typeof value !== "string") return void 0;
   const lower = value.trim().toLowerCase();
   if (!lower) return void 0;
   for (const [pattern, slug] of RUNTIME_CLIENT_PATTERNS) {
     if (pattern.test(lower)) return slug;
   }
+  if (lower === "rmcp" && env.WINDSURF_IDE_TYPE) return "windsurf";
   return void 0;
 }
 
@@ -28777,7 +28790,7 @@ async function startMcpServer(options) {
   }
   function aiClientHeaders() {
     const rawName = server.getClientVersion()?.name?.trim() || void 0;
-    const aiClient = canonicalizeAiClient(rawName);
+    const aiClient = canonicalizeAiClient(rawName, process.env);
     if (aiClient) return { "X-Argent-AI-Client": aiClient };
     if (rawName) return { "X-Argent-AI-Client": "other" };
     return {};

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.1";
+    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.1",
+  "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",