@swmansion/argent 0.24.1-next.4 → 0.24.1-next.5

package/dist/cli-cmds.mjs

@@ -21090,6 +21090,13 @@ var PLATFORMS = [
   "tvos",
   "android-tv"
 ];
+var DEVICE_KINDS = [
+  "simulator",
+  "emulator",
+  "vvd",
+  "device",
+  "app"
+];
 var DEBUGGER_NOT_CONNECTED_REASONS = [
   "metro_not_running",
   "no_app_connected",
@@ -21133,6 +21140,7 @@ var arrayOf = (elem, maxLen = 16) => (v) => {
 };
 var TOOL_NAME = matches(/^[a-z][a-z0-9_-]{0,63}$/, 64);
 var PLATFORM = oneOf(PLATFORMS);
+var DEVICE_KIND = oneOf(DEVICE_KINDS);
 var UUID = matches(
   /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/,
   36
@@ -21276,6 +21284,7 @@ var ALLOWED = {
     tool: TOOL_NAME,
     tool_invocation_id: UUID,
     platform: PLATFORM,
+    device_kind: DEVICE_KIND,
     ...AI_TELEMETRY
   },
   "tool:complete": {
@@ -21283,6 +21292,7 @@ var ALLOWED = {
     tool: TOOL_NAME,
     tool_invocation_id: UUID,
     platform: PLATFORM,
+    device_kind: DEVICE_KIND,
     duration_ms: DURATION_MS,
     ...AI_TELEMETRY
   },
@@ -21291,6 +21301,7 @@ var ALLOWED = {
     tool: TOOL_NAME,
     tool_invocation_id: UUID,
     platform: PLATFORM,
+    device_kind: DEVICE_KIND,
     duration_ms: DURATION_MS,
     // Emit side sends only names declared in the tool's zod shape, capped at 16
     // because arrayOf voids the whole array once it is longer.
@@ -21825,7 +21836,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.24.1-next.4";
+    return "0.24.1-next.5";
   }
   return "0.0.0";
 }

package/dist/installer.mjs

@@ -15943,6 +15943,13 @@ var PLATFORMS = [
   "tvos",
   "android-tv"
 ];
+var DEVICE_KINDS = [
+  "simulator",
+  "emulator",
+  "vvd",
+  "device",
+  "app"
+];
 var DEBUGGER_NOT_CONNECTED_REASONS = [
   "metro_not_running",
   "no_app_connected",
@@ -15986,6 +15993,7 @@ var arrayOf = (elem, maxLen = 16) => (v) => {
 };
 var TOOL_NAME = matches(/^[a-z][a-z0-9_-]{0,63}$/, 64);
 var PLATFORM = oneOf(PLATFORMS);
+var DEVICE_KIND = oneOf(DEVICE_KINDS);
 var UUID = matches(
   /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/,
   36
@@ -16129,6 +16137,7 @@ var ALLOWED = {
     tool: TOOL_NAME,
     tool_invocation_id: UUID,
     platform: PLATFORM,
+    device_kind: DEVICE_KIND,
     ...AI_TELEMETRY
   },
   "tool:complete": {
@@ -16136,6 +16145,7 @@ var ALLOWED = {
     tool: TOOL_NAME,
     tool_invocation_id: UUID,
     platform: PLATFORM,
+    device_kind: DEVICE_KIND,
     duration_ms: DURATION_MS,
     ...AI_TELEMETRY
   },
@@ -16144,6 +16154,7 @@ var ALLOWED = {
     tool: TOOL_NAME,
     tool_invocation_id: UUID,
     platform: PLATFORM,
+    device_kind: DEVICE_KIND,
     duration_ms: DURATION_MS,
     // Emit side sends only names declared in the tool's zod shape, capped at 16
     // because arrayOf voids the whole array once it is longer.
@@ -16678,7 +16689,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.24.1-next.4";
+    return "0.24.1-next.5";
   }
   return "0.0.0";
 }

package/dist/mcp-server.mjs

@@ -17588,6 +17588,13 @@ var PLATFORMS = [
   "tvos",
   "android-tv"
 ];
+var DEVICE_KINDS = [
+  "simulator",
+  "emulator",
+  "vvd",
+  "device",
+  "app"
+];
 var DEBUGGER_NOT_CONNECTED_REASONS = [
   "metro_not_running",
   "no_app_connected",
@@ -17652,6 +17659,7 @@ var arrayOf = (elem, maxLen = 16) => (v) => {
 };
 var TOOL_NAME = matches(/^[a-z][a-z0-9_-]{0,63}$/, 64);
 var PLATFORM = oneOf(PLATFORMS);
+var DEVICE_KIND = oneOf(DEVICE_KINDS);
 var UUID = matches(
   /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/,
   36
@@ -17795,6 +17803,7 @@ var ALLOWED = {
     tool: TOOL_NAME,
     tool_invocation_id: UUID,
     platform: PLATFORM,
+    device_kind: DEVICE_KIND,
     ...AI_TELEMETRY
   },
   "tool:complete": {
@@ -17802,6 +17811,7 @@ var ALLOWED = {
     tool: TOOL_NAME,
     tool_invocation_id: UUID,
     platform: PLATFORM,
+    device_kind: DEVICE_KIND,
     duration_ms: DURATION_MS,
     ...AI_TELEMETRY
   },
@@ -17810,6 +17820,7 @@ var ALLOWED = {
     tool: TOOL_NAME,
     tool_invocation_id: UUID,
     platform: PLATFORM,
+    device_kind: DEVICE_KIND,
     duration_ms: DURATION_MS,
     // Emit side sends only names declared in the tool's zod shape, capped at 16
     // because arrayOf voids the whole array once it is longer.

package/dist/tool-server.cjs

@@ -93873,6 +93873,13 @@ var PLATFORMS = [
   "tvos",
   "android-tv"
 ];
+var DEVICE_KINDS = [
+  "simulator",
+  "emulator",
+  "vvd",
+  "device",
+  "app"
+];
 var DEBUGGER_NOT_CONNECTED_REASONS = [
   "metro_not_running",
   "no_app_connected",
@@ -93921,6 +93928,7 @@ var arrayOf = (elem, maxLen = 16) => (v) => {
 };
 var TOOL_NAME = matches(/^[a-z][a-z0-9_-]{0,63}$/, 64);
 var PLATFORM = oneOf(PLATFORMS);
+var DEVICE_KIND = oneOf(DEVICE_KINDS);
 var UUID = matches(
   /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/,
   36
@@ -94064,6 +94072,7 @@ var ALLOWED = {
     tool: TOOL_NAME,
     tool_invocation_id: UUID,
     platform: PLATFORM,
+    device_kind: DEVICE_KIND,
     ...AI_TELEMETRY
   },
   "tool:complete": {
@@ -94071,6 +94080,7 @@ var ALLOWED = {
     tool: TOOL_NAME,
     tool_invocation_id: UUID,
     platform: PLATFORM,
+    device_kind: DEVICE_KIND,
     duration_ms: DURATION_MS,
     ...AI_TELEMETRY
   },
@@ -94079,6 +94089,7 @@ var ALLOWED = {
     tool: TOOL_NAME,
     tool_invocation_id: UUID,
     platform: PLATFORM,
+    device_kind: DEVICE_KIND,
     duration_ms: DURATION_MS,
     // Emit side sends only names declared in the tool's zod shape, capped at 16
     // because arrayOf voids the whole array once it is longer.
@@ -94613,7 +94624,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.24.1-next.4";
+    return "0.24.1-next.5";
   }
   return "0.0.0";
 }
@@ -95208,6 +95219,7 @@ function attachRegistryTelemetry(registry2) {
       tool_invocation_id: toolInvocationId,
       ...meta3.device_provider ? { device_provider: meta3.device_provider } : {},
       ...meta3.platform ? { platform: meta3.platform } : {},
+      ...meta3.device_kind ? { device_kind: meta3.device_kind } : {},
       ...aiTelemetryFromMeta(meta3)
     });
   };
@@ -95218,6 +95230,7 @@ function attachRegistryTelemetry(registry2) {
       tool_invocation_id: toolInvocationId,
       ...meta3.device_provider ? { device_provider: meta3.device_provider } : {},
       ...meta3.platform ? { platform: meta3.platform } : {},
+      ...meta3.device_kind ? { device_kind: meta3.device_kind } : {},
       duration_ms: durationMs,
       ...aiTelemetryFromMeta(meta3)
     });
@@ -95235,6 +95248,7 @@ function attachRegistryTelemetry(registry2) {
       tool_invocation_id: toolInvocationId,
       ...meta3.device_provider ? { device_provider: meta3.device_provider } : {},
       ...meta3.platform ? { platform: meta3.platform } : {},
+      ...meta3.device_kind ? { device_kind: meta3.device_kind } : {},
       duration_ms: durationMs,
       ...signal,
       ...aiTelemetryFromMeta(meta3)
@@ -107873,6 +107887,7 @@ init_device_info();
 
 // ../tool-server/src/utils/telemetry-platform.ts
 init_device_info();
+init_external_devices();
 init_adb();
 function refineTvPlatform(basePlatform, deviceId) {
   if (basePlatform === "ios" && getCachedSimulatorRuntimeKind(deviceId) === "tv") {
@@ -107883,8 +107898,23 @@ function refineTvPlatform(basePlatform, deviceId) {
   }
   return basePlatform;
 }
+var ANDROID_USB_SERIAL = /^(?=.*\d)(?=.*[A-Za-z])[A-Za-z0-9]{6,20}$/;
+var ANDROID_TCP_SERIAL = /^(?:\d{1,3}\.){3}\d{1,3}:\d{1,5}$/;
+function telemetryDeviceKind(device, nativeId) {
+  if (device.kind === "unknown") return void 0;
+  if (device.platform !== "android" || device.kind !== "device") return device.kind;
+  if (consolePortFromAdbSerial(nativeId) !== null) return "emulator";
+  if (ANDROID_USB_SERIAL.test(nativeId) || ANDROID_TCP_SERIAL.test(nativeId)) return "device";
+  return void 0;
+}
+function attributeDeviceForTelemetry(deviceId) {
+  const device = resolveDevice(deviceId);
+  const platform = refineTvPlatform(device.platform, deviceId);
+  const device_kind = telemetryDeviceKind(device, externalNativeId(deviceId));
+  return device_kind ? { platform, device_kind } : { platform };
+}
 function classifyDeviceForTelemetry(deviceId) {
-  return refineTvPlatform(classifyDevice(deviceId), deviceId);
+  return attributeDeviceForTelemetry(deviceId).platform;
 }
 
 // ../tool-server/src/utils/device-shutdown.ts
@@ -114304,11 +114334,15 @@ function targetsIosPhysicalDevice(data) {
   const deviceArg = extractDeviceArg(data) ?? flowDevice;
   return deviceArg !== null && isIosPhysicalDevice(resolveDevice(deviceArg));
 }
-function inferPlatform(deviceId) {
+function inferDeviceAttribution(deviceId) {
   if (!deviceId) return null;
   try {
     const canonical = canonicalDeviceId(deviceId) ?? deviceId;
-    return refineTvPlatform(resolveDevice(canonical).platform, canonical);
+    const attribution = attributeDeviceForTelemetry(canonical);
+    if (attribution.device_kind && isLogicalKeyedDevice(canonical)) {
+      return { platform: attribution.platform };
+    }
+    return attribution;
   } catch {
     return null;
   }
@@ -114327,30 +114361,33 @@ function extractAiTelemetryMeta(req) {
 function extractInvocationMeta(hasCapability, data, aiMeta) {
   const meta3 = { ...aiMeta };
   if (hasCapability && data && typeof data === "object") {
-    const platform = platformFromArgs(data);
-    if (platform) meta3.platform = platform;
+    const attribution = deviceAttributionFromArgs(data);
+    if (attribution) Object.assign(meta3, attribution);
   }
   const deviceArg = extractDeviceArg(data);
   const provider = deviceArg ? externalProviderLabel(deviceArg) : void 0;
   if (provider) meta3.device_provider = provider;
   return Object.keys(meta3).length > 0 ? meta3 : null;
 }
-function platformFromArgs(data) {
+function deviceAttributionFromArgs(data) {
   if (!data || typeof data !== "object") return null;
   const deviceArg = extractDeviceArg(data);
-  if (deviceArg) return inferPlatform(deviceArg) ?? null;
-  if (typeof data.avdName === "string") return "android";
+  if (deviceArg) return inferDeviceAttribution(deviceArg);
+  if (typeof data.avdName === "string") {
+    return { platform: "android" };
+  }
   return null;
 }
 function deriveChildInvocationMeta(parentMeta, childArgs) {
-  const childPlatform = platformFromArgs(childArgs);
+  const childAttribution = deviceAttributionFromArgs(childArgs);
+  if (!childAttribution) return parentMeta;
   const childDeviceArg = extractDeviceArg(childArgs);
   const childProvider = childDeviceArg ? externalProviderLabel(childDeviceArg) : void 0;
-  if (!childPlatform && !childProvider) return parentMeta;
+  const { platform: _p, device_kind: _k, device_provider: _d, ...inherited } = parentMeta;
   return {
-    ...parentMeta,
+    ...inherited,
     ...childProvider ? { device_provider: childProvider } : {},
-    ...childPlatform ? { platform: childPlatform } : {}
+    ...childAttribution
   };
 }
 var LOOPBACK_HOSTNAMES = ["127.0.0.1", "localhost", "::1"];
@@ -114593,12 +114630,12 @@ function createHttpApp(registry2, options) {
         if (!options?.recordFailure) return;
         const failedDeviceArg = extractDeviceArg(parsedDataForMeta);
         const provider = failedDeviceArg ? externalProviderLabel(failedDeviceArg) : void 0;
-        const platform = inferPlatform(failedDeviceArg);
+        const attribution = inferDeviceAttribution(failedDeviceArg);
         options.recordFailure(
           name,
           {
             ...provider ? { device_provider: provider } : {},
-            ...platform ? { platform } : {},
+            ...attribution,
             ...extraMeta?.invalid_params?.length ? { invalid_params: extraMeta.invalid_params } : {},
             ...aiMeta
           },
@@ -155346,6 +155383,7 @@ function start() {
         tool: toolId,
         ...meta3.device_provider ? { device_provider: meta3.device_provider } : {},
         ...meta3.platform ? { platform: meta3.platform } : {},
+        ...meta3.device_kind ? { device_kind: meta3.device_kind } : {},
         ...meta3.invalid_params?.length ? { invalid_params: meta3.invalid_params } : {},
         duration_ms: durationMs,
         ...signal,

package/package.json

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