@swmansion/argent 0.16.1-next.4 → 0.16.1-next.6

package/dist/tool-server.cjs

@@ -122123,6 +122123,20 @@ function normalizeWsUrl(wsUrl, port) {
   return url2.toString();
 }
 
+// ../tool-server/src/utils/debugger/device-alias.ts
+var logicalIdToConnectId = /* @__PURE__ */ new Map();
+function rememberDeviceAlias(logicalDeviceId, connectDeviceId) {
+  if (!logicalDeviceId || logicalDeviceId === connectDeviceId) return;
+  logicalIdToConnectId.set(logicalDeviceId, connectDeviceId);
+}
+function canonicalDeviceId(deviceId) {
+  if (!deviceId) return deviceId;
+  return logicalIdToConnectId.get(deviceId) ?? deviceId;
+}
+function forgetDeviceAlias(logicalDeviceId) {
+  if (logicalDeviceId) logicalIdToConnectId.delete(logicalDeviceId);
+}
+
 // ../tool-server/src/utils/debugger/source-resolver.ts
 var fs18 = __toESM(require("node:fs/promises"));
 var path17 = __toESM(require("node:path"));
@@ -122541,6 +122555,7 @@ var jsRuntimeDebuggerBlueprint = {
       consoleEvents,
       consoleSocketUrl: consoleServer.url
     };
+    rememberDeviceAlias(api.logicalDeviceId, deviceId);
     const events = new TypedEventEmitter();
     cdp.events.on("disconnected", (error52) => {
       events.emit(
@@ -122556,6 +122571,7 @@ var jsRuntimeDebuggerBlueprint = {
     return {
       api,
       dispose: async () => {
+        forgetDeviceAlias(api.logicalDeviceId);
         await consoleServer.close();
         logWriter.close();
         await cdp.disconnect();
@@ -133858,18 +133874,19 @@ var RN_ONLY_TOOL_CAPABILITY = {
   android: { emulator: true, device: true, unknown: true }
 };
 function debuggerServiceRef(params) {
-  if (params.device_id && params.device_id.startsWith(CHROMIUM_ID_PREFIX)) {
-    const device = resolveDevice(params.device_id);
+  const deviceId = canonicalDeviceId(params.device_id);
+  if (deviceId && deviceId.startsWith(CHROMIUM_ID_PREFIX)) {
+    const device = resolveDevice(deviceId);
     return chromiumJsRuntimeDebuggerRef(device);
   }
-  return `JsRuntimeDebugger:${params.port}:${params.device_id}`;
+  return `JsRuntimeDebugger:${params.port}:${deviceId}`;
 }
 
 // ../tool-server/src/tools/debugger/debugger-connect.ts
 var zodSchema29 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port (ignored for Chromium \u2014 its CDP port is encoded in device_id)"),
   device_id: external_exports.string().describe(
-    "Device id: iOS simulator UDID, Android logicalDeviceId returned by Metro, Vega serial (amazon-...), or Chromium device id (chromium-cdp-<port>) from list-devices. When a logicalDeviceId is returned, forward it as device_id to all subsequent debugger-* calls to pin them to this device; when none is returned (Vega), keep passing the id you connected with."
+    "Device id from list-devices: iOS simulator UDID, Android serial, Vega serial (amazon-...), or Chromium device id (chromium-cdp-<port>). Pass this SAME id as device_id to every subsequent debugger-* call to pin them to this device. The returned logicalDeviceId is informational (Metro's own per-connection handle, absent on Vega); you do not switch to it \u2014 forwarding it still resolves here, but the list-devices id is the stable one."
   )
 });
 var debuggerConnectTool = {
@@ -133902,7 +133919,7 @@ init_zod();
 var zodSchema30 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port (ignored for Chromium)"),
   device_id: external_exports.string().describe(
-    "Device id from debugger-connect (iOS simulator UDID, Android logicalDeviceId, Vega serial, or Chromium device id)."
+    "Device id from list-devices \u2014 the SAME id you passed to debugger-connect (iOS simulator UDID, Android serial, Vega serial, or Chromium device id). The logicalDeviceId debugger-connect returns also resolves here, but prefer the stable list-devices id."
   )
 });
 var debuggerStatusTool = {
@@ -133937,7 +133954,7 @@ init_zod();
 var zodSchema31 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port (ignored for Chromium)"),
   device_id: external_exports.string().describe(
-    "Device id from debugger-connect (iOS simulator UDID, Android logicalDeviceId, Vega serial, or Chromium device id)."
+    "Device id from list-devices \u2014 the SAME id you passed to debugger-connect (iOS simulator UDID, Android serial, Vega serial, or Chromium device id). The logicalDeviceId debugger-connect returns also resolves here, but prefer the stable list-devices id."
   ),
   expression: external_exports.string().describe("JavaScript expression to evaluate in the app runtime")
 });
@@ -133968,7 +133985,7 @@ init_src();
 var zodSchema32 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port"),
   device_id: external_exports.string().describe(
-    "Device logicalDeviceId from debugger-connect (iOS simulator UDID or Android logicalDeviceId)."
+    "Device id from list-devices \u2014 the SAME id you passed to debugger-connect (iOS simulator UDID or Android serial)."
   )
 });
 var debuggerReloadMetroTool = {
@@ -133983,7 +134000,7 @@ Use when you want to apply code changes or reset JS state. Returns { reloaded, p
   // want that on Chromium later, it deserves its own tool.
   capability: RN_ONLY_TOOL_CAPABILITY,
   services: (params) => ({
-    debugger: `JsRuntimeDebugger:${params.port}:${params.device_id}`
+    debugger: `JsRuntimeDebugger:${params.port}:${canonicalDeviceId(params.device_id)}`
   }),
   async execute(services, _params) {
     const api = services.debugger;
@@ -134786,7 +134803,7 @@ function buildTextTree(data, opts) {
 var zodSchema33 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port"),
   device_id: external_exports.string().describe(
-    "Device logicalDeviceId from debugger-connect (iOS simulator UDID or Android logicalDeviceId)."
+    "Device id from list-devices \u2014 the SAME id you passed to debugger-connect (iOS simulator UDID or Android serial)."
   ),
   onScreenOnly: external_exports.boolean().default(true).describe(
     "When true (default), only components visible on screen are returned. Set to false to include all mounted components including those scrolled off-screen. Useful when you need to understand the full page structure."
@@ -134825,7 +134842,7 @@ Use when you need tap coordinates for a React Native UI element. Returns a compa
   // for DOM-tree discovery on Chromium.
   capability: RN_ONLY_TOOL_CAPABILITY,
   services: (params) => ({
-    debugger: `JsRuntimeDebugger:${params.port}:${params.device_id}`
+    debugger: `JsRuntimeDebugger:${params.port}:${canonicalDeviceId(params.device_id)}`
   }),
   async execute(services, params) {
     const api = services.debugger;
@@ -134853,7 +134870,7 @@ Use when you need tap coordinates for a React Native UI element. Returns a compa
     const deviceLine = [
       `device: ${api.deviceName}`,
       `app: ${api.appName}`,
-      ...api.logicalDeviceId ? [`udid: ${api.logicalDeviceId}`] : []
+      ...api.logicalDeviceId ? [`logicalDeviceId: ${api.logicalDeviceId}`] : []
     ].join(" | ");
     return `[${deviceLine}]
 ${tree}`;
@@ -135293,7 +135310,7 @@ function filterInspectItems(items, includeSkipped = false) {
 var zodSchema34 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port"),
   device_id: external_exports.string().describe(
-    "Device logicalDeviceId from debugger-connect (iOS simulator UDID or Android logicalDeviceId)."
+    "Device id from list-devices \u2014 the SAME id you passed to debugger-connect (iOS simulator UDID or Android serial)."
   ),
   x: external_exports.coerce.number().describe("Logical X coordinate on device screen"),
   y: external_exports.coerce.number().describe("Logical Y coordinate on device screen"),
@@ -135330,7 +135347,7 @@ Use when you need the source file and line for a component at a tap coordinate.
   // out of scope for this port.
   capability: RN_ONLY_TOOL_CAPABILITY,
   services: (params) => ({
-    debugger: `JsRuntimeDebugger:${params.port}:${params.device_id}`
+    debugger: `JsRuntimeDebugger:${params.port}:${canonicalDeviceId(params.device_id)}`
   }),
   async execute(services, params) {
     const api = services.debugger;
@@ -135427,7 +135444,7 @@ init_zod();
 var zodSchema35 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port (ignored for Chromium)"),
   device_id: external_exports.string().describe(
-    "Device id from debugger-connect (iOS simulator UDID, Android logicalDeviceId, Vega serial, or Chromium device id)."
+    "Device id from list-devices \u2014 the SAME id you passed to debugger-connect (iOS simulator UDID, Android serial, Vega serial, or Chromium device id). The logicalDeviceId debugger-connect returns also resolves here, but prefer the stable list-devices id."
   )
 });
 var debuggerLogRegistryTool = {
@@ -135515,7 +135532,9 @@ ${lines.join("\n")}`;
 }
 var zodSchema36 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port (RN only; ignored on Chromium)"),
-  device_id: external_exports.string().describe("Device UDID (logicalDeviceId)."),
+  device_id: external_exports.string().describe(
+    "Device id from list-devices (iOS simulator UDID or Android serial) \u2014 the same id used with debugger-connect."
+  ),
   pageIndex: external_exports.union([external_exports.coerce.number().int().nonnegative(), external_exports.literal("latest")]).default("latest").describe(
     'Page index (0-based) or "latest" for the most recent page. Each page contains up to 50 entries.'
   )
@@ -135537,7 +135556,7 @@ Fails if the app is not connected (RN) or the device is not reachable (Chromium)
     if (device.platform === "chromium") {
       return { chromium: chromiumCdpRef(device) };
     }
-    return { inspector: `NetworkInspector:${params.port}:${params.device_id}` };
+    return { inspector: `NetworkInspector:${params.port}:${canonicalDeviceId(params.device_id)}` };
   },
   async execute(services, params) {
     if (resolveDevice(params.device_id).platform === "chromium") {
@@ -135601,7 +135620,9 @@ function redactHeaders(headers) {
 var MAX_BODY_SIZE = 1e3;
 var zodSchema37 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port"),
-  device_id: external_exports.string().describe("Device UDID (logicalDeviceId)."),
+  device_id: external_exports.string().describe(
+    "Device id from list-devices (iOS simulator UDID or Android serial) \u2014 the same id used with debugger-connect."
+  ),
   requestId: external_exports.string().describe("The requestId from view-network-logs to get full details for"),
   includeBody: external_exports.coerce.boolean().default(true).describe("Whether to include the response body (if captured). Defaults to true.")
 });
@@ -135620,7 +135641,7 @@ Returns an error message string if the requestId is not found \u2014 use view-ne
     if (device.platform === "chromium") {
       return { chromium: chromiumCdpRef(device) };
     }
-    return { inspector: `NetworkInspector:${params.port}:${params.device_id}` };
+    return { inspector: `NetworkInspector:${params.port}:${canonicalDeviceId(params.device_id)}` };
   },
   async execute(services, params) {
     if (resolveDevice(params.device_id).platform === "chromium") {
@@ -136179,7 +136200,7 @@ var NO_RENDERERS_ATTACHED_ERROR = "React DevTools hook is present but no React r
 var zodSchema40 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port"),
   device_id: external_exports.string().describe(
-    "Device logicalDeviceId from debugger-connect (iOS simulator UDID or Android logicalDeviceId)."
+    "Device id from list-devices \u2014 the SAME id you passed to debugger-connect (iOS simulator UDID or Android serial)."
   ),
   sample_interval_us: external_exports.coerce.number().int().positive().default(100).describe("CPU sampling interval in microseconds (default 100)"),
   force: external_exports.boolean().default(false).describe(
@@ -136210,8 +136231,9 @@ Fails if the Hermes runtime is not reachable or the Metro CDP connection cannot
     capability: RN_ONLY_TOOL_CAPABILITY,
     services: () => ({}),
     async execute(_services, params) {
-      const jsdUrn = `${JS_RUNTIME_DEBUGGER_NAMESPACE}:${params.port}:${params.device_id}`;
-      const psUrn = `${REACT_PROFILER_SESSION_NAMESPACE}:${params.port}:${params.device_id}`;
+      const deviceId = canonicalDeviceId(params.device_id);
+      const jsdUrn = `${JS_RUNTIME_DEBUGGER_NAMESPACE}:${params.port}:${deviceId}`;
+      const psUrn = `${REACT_PROFILER_SESSION_NAMESPACE}:${params.port}:${deviceId}`;
       const ignore = () => {
       };
       async function disposeAndWait() {
@@ -136478,7 +136500,7 @@ async function readCommitTree(path36) {
 var zodSchema41 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port"),
   device_id: external_exports.string().describe(
-    "Device logicalDeviceId from debugger-connect (iOS simulator UDID or Android logicalDeviceId)."
+    "Device id from list-devices \u2014 the SAME id you passed to debugger-connect (iOS simulator UDID or Android serial)."
   )
 });
 function normalizeChangeDescription(raw) {
@@ -136564,7 +136586,7 @@ Fails if no active profiling session exists or the CDP connection was lost durin
     capability: RN_ONLY_TOOL_CAPABILITY,
     services: () => ({}),
     async execute(_services, params) {
-      const psUrn = `${REACT_PROFILER_SESSION_NAMESPACE}:${params.port}:${params.device_id}`;
+      const psUrn = `${REACT_PROFILER_SESSION_NAMESPACE}:${params.port}:${canonicalDeviceId(params.device_id)}`;
       const snapshot = registry2.getSnapshot();
       const entry = snapshot.services.get(psUrn);
       if (!entry || entry.state !== "RUNNING" /* RUNNING */) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/argent",
-  "version": "0.16.1-next.4",
+  "version": "0.16.1-next.6",
   "description": "MCP server for iOS Simulator and Android Emulator control",
   "license": "Apache-2.0",
   "repository": {