@swmansion/argent 0.32.1-next.2 → 0.32.1-next.20

package/dist/mcp-server.mjs

@@ -24943,6 +24943,10 @@ var FLAG_REGISTRY = [
     name: "video-watermark",
     description: "Overlay the argent corner watermark on recorded screen videos. On by default; turn it off with `argent disable video-watermark`.",
     defaultEnabled: true
+  },
+  {
+    name: "macos-apps",
+    description: "Drive native Mac apps (AppKit, SwiftUI, react-native-macos) from inside the app. Adds the macos platform to list-devices and boot-device, and the file-panel and menu-bar tools. Off by default."
   }
 ];
 function getFlagDefinition(name, registry2 = FLAG_REGISTRY) {
@@ -25735,6 +25739,8 @@ var FAILURE_CODES = {
   CLI_RUN_ARGS_JSON_INVALID: "CLI_RUN_ARGS_JSON_INVALID",
   CLI_RUN_INPUT_VALIDATION_FAILED: "CLI_RUN_INPUT_VALIDATION_FAILED",
   CLI_RUN_TOOL_CALL_FAILED: "CLI_RUN_TOOL_CALL_FAILED",
+  // The result carried the tool-server's `failure` field.
+  CLI_RUN_TOOL_RESULT_FAILED: "CLI_RUN_TOOL_RESULT_FAILED",
   CLI_RUN_SAVE_IMAGE_FAILED: "CLI_RUN_SAVE_IMAGE_FAILED",
   TOOL_CAPABILITY_UNSUPPORTED_OPERATION: "TOOL_CAPABILITY_UNSUPPORTED_OPERATION",
   TOOL_PLATFORM_NOT_IMPLEMENTED: "TOOL_PLATFORM_NOT_IMPLEMENTED",
@@ -25750,6 +25756,7 @@ var FAILURE_CODES = {
   INSTALL_MODE_FLAG_CONFLICT: "INSTALL_MODE_FLAG_CONFLICT",
   INSTALL_FROM_TAR_PACKAGE_FAILED: "INSTALL_FROM_TAR_PACKAGE_FAILED",
   INSTALL_INIT_TRIGGERED_UPDATE_FAILED: "INSTALL_INIT_TRIGGERED_UPDATE_FAILED",
+  INSTALL_SKILLS_FAILED: "INSTALL_SKILLS_FAILED",
   INSTALL_SKILLS_REFRESH_FAILED: "INSTALL_SKILLS_REFRESH_FAILED",
   INSTALL_UNCLASSIFIED_FAILED: "INSTALL_UNCLASSIFIED_FAILED",
   UPDATE_INSTALLED_VERSION_DETECT_FAILED: "UPDATE_INSTALLED_VERSION_DETECT_FAILED",
@@ -25833,15 +25840,21 @@ var FAILURE_CODES = {
   ANDROID_LAUNCH_AM_START_FAILED: "ANDROID_LAUNCH_AM_START_FAILED",
   ANDROID_OPEN_URL_FAILED: "ANDROID_OPEN_URL_FAILED",
   ANDROID_REINSTALL_INSTALL_FAILED: "ANDROID_REINSTALL_INSTALL_FAILED",
+  ANDROID_REINSTALL_UNINSTALL_FAILED: "ANDROID_REINSTALL_UNINSTALL_FAILED",
   ANDROID_RESTART_FAILED: "ANDROID_RESTART_FAILED",
   ANDROID_SETTINGS_PERMISSION_FAILED: "ANDROID_SETTINGS_PERMISSION_FAILED",
   IOS_LAUNCH_SIMCTL_FAILED: "IOS_LAUNCH_SIMCTL_FAILED",
   IOS_OPEN_URL_FAILED: "IOS_OPEN_URL_FAILED",
   IOS_REINSTALL_INSTALL_FAILED: "IOS_REINSTALL_INSTALL_FAILED",
+  IOS_REINSTALL_UNINSTALL_FAILED: "IOS_REINSTALL_UNINSTALL_FAILED",
   IOS_RESTART_LAUNCH_FAILED: "IOS_RESTART_LAUNCH_FAILED",
+  IOS_RESTART_TERMINATE_FAILED: "IOS_RESTART_TERMINATE_FAILED",
+  IOS_TERMINATE_APP_FAILED: "IOS_TERMINATE_APP_FAILED",
   IOS_SETTINGS_PERMISSION_FAILED: "IOS_SETTINGS_PERMISSION_FAILED",
   IOS_SHAKE_FAILED: "IOS_SHAKE_FAILED",
   ANDROID_SHAKE_FAILED: "ANDROID_SHAKE_FAILED",
+  STOP_METRO_PORT_PROBE_FAILED: "STOP_METRO_PORT_PROBE_FAILED",
+  STOP_METRO_SIGNAL_FAILED: "STOP_METRO_SIGNAL_FAILED",
   // The hinge of a foldable iOS simulator: the server refused the request on a
   // foldable (a bad angle, a hinge that would not move) vs. nothing to fold —
   // a device that is not foldable, no hinge route, a remote simulator.
@@ -25940,6 +25953,8 @@ var FAILURE_CODES = {
   REACT_PROFILER_START_FAILED: "REACT_PROFILER_START_FAILED",
   REACT_PROFILER_START_VERIFY_FAILED: "REACT_PROFILER_START_VERIFY_FAILED",
   REACT_PROFILER_SESSION_TORN_DOWN: "REACT_PROFILER_SESSION_TORN_DOWN",
+  REACT_PROFILER_SESSION_TAKEN_OVER: "REACT_PROFILER_SESSION_TAKEN_OVER",
+  REACT_PROFILER_STOP_IN_PROGRESS: "REACT_PROFILER_STOP_IN_PROGRESS",
   REACT_PROFILER_HOOK_ERROR: "REACT_PROFILER_HOOK_ERROR",
   REACT_PROFILER_ANALYZE_NO_DATA: "REACT_PROFILER_ANALYZE_NO_DATA",
   NATIVE_PROFILER_FACTORY_OPTIONS_MISSING: "NATIVE_PROFILER_FACTORY_OPTIONS_MISSING",
@@ -25987,10 +26002,13 @@ var FAILURE_CODES = {
   FLOW_NAME_INVALID: "FLOW_NAME_INVALID",
   FLOW_NO_ACTIVE_RECORDING: "FLOW_NO_ACTIVE_RECORDING",
   FLOW_FILE_INVALID: "FLOW_FILE_INVALID",
+  FLOW_FILE_NEWER_VERSION: "FLOW_FILE_NEWER_VERSION",
   FLOW_FILE_WRITE_FAILED: "FLOW_FILE_WRITE_FAILED",
   FLOW_ENTRY_UNRECOGNIZED: "FLOW_ENTRY_UNRECOGNIZED",
   FLOW_E2E_HAS_PREREQUISITE: "FLOW_E2E_HAS_PREREQUISITE",
   FLOW_DEVICE_RESOLUTION: "FLOW_DEVICE_RESOLUTION",
+  // The target does not satisfy the test's `requires:` block; a directory run skips it.
+  FLOW_REQUIREMENTS_UNMET: "FLOW_REQUIREMENTS_UNMET",
   PROFILER_QUERY_MODE_INVALID: "PROFILER_QUERY_MODE_INVALID",
   PROFILER_QUERY_REQUIRED_PARAM_MISSING: "PROFILER_QUERY_REQUIRED_PARAM_MISSING",
   PROFILER_DATA_NOT_LOADED: "PROFILER_DATA_NOT_LOADED",
@@ -26009,11 +26027,38 @@ var FAILURE_CODES = {
   CHROMIUM_STORAGE_EVAL_FAILED: "CHROMIUM_STORAGE_EVAL_FAILED",
   CHROMIUM_TAB_NOT_FOUND: "CHROMIUM_TAB_NOT_FOUND",
   CHROMIUM_TAB_OPEN_FAILED: "CHROMIUM_TAB_OPEN_FAILED",
+  CHROMIUM_NAVIGATE_FAILED: "CHROMIUM_NAVIGATE_FAILED",
   CHROMIUM_DESCRIBE_FAILED: "CHROMIUM_DESCRIBE_FAILED",
   CHROMIUM_ELECTRON_APP_PATH_INVALID: "CHROMIUM_ELECTRON_APP_PATH_INVALID",
   CHROMIUM_ELECTRON_SPAWN_FAILED: "CHROMIUM_ELECTRON_SPAWN_FAILED",
   CHROMIUM_ELECTRON_CDP_TIMEOUT: "CHROMIUM_ELECTRON_CDP_TIMEOUT",
   CHROMIUM_ELECTRON_EXITED_BEFORE_READY: "CHROMIUM_ELECTRON_EXITED_BEFORE_READY",
+  /**
+   * Native Mac apps (the `macos-apps` flag)
+   * @see [macos-app.ts](../../tool-server/src/blueprints/macos-app.ts)
+   */
+  MACOS_APP_UNSUPPORTED_HOST: "MACOS_APP_UNSUPPORTED_HOST",
+  MACOS_APP_PATH_INVALID: "MACOS_APP_PATH_INVALID",
+  MACOS_APP_BUNDLE_INVALID: "MACOS_APP_BUNDLE_INVALID",
+  MACOS_APP_NOT_FOUND: "MACOS_APP_NOT_FOUND",
+  MACOS_APP_HARDENED_RUNTIME: "MACOS_APP_HARDENED_RUNTIME",
+  MACOS_APP_LIBRARY_MISSING: "MACOS_APP_LIBRARY_MISSING",
+  MACOS_APP_LIBRARY_STAGE_FAILED: "MACOS_APP_LIBRARY_STAGE_FAILED",
+  MACOS_APP_ALREADY_RUNNING: "MACOS_APP_ALREADY_RUNNING",
+  MACOS_APP_SPAWN_FAILED: "MACOS_APP_SPAWN_FAILED",
+  MACOS_APP_EXITED_BEFORE_READY: "MACOS_APP_EXITED_BEFORE_READY",
+  MACOS_APP_HANDSHAKE_TIMEOUT: "MACOS_APP_HANDSHAKE_TIMEOUT",
+  MACOS_APP_HANDSHAKE_INVALID: "MACOS_APP_HANDSHAKE_INVALID",
+  MACOS_APP_NOT_RUNNING: "MACOS_APP_NOT_RUNNING",
+  MACOS_APP_NOT_CONNECTED: "MACOS_APP_NOT_CONNECTED",
+  MACOS_APP_CONNECTION_LOST: "MACOS_APP_CONNECTION_LOST",
+  MACOS_APP_CONNECTION_CLOSED: "MACOS_APP_CONNECTION_CLOSED",
+  MACOS_APP_RPC_TIMEOUT: "MACOS_APP_RPC_TIMEOUT",
+  MACOS_APP_RPC_ERROR: "MACOS_APP_RPC_ERROR",
+  MACOS_APP_TERMINATE_FAILED: "MACOS_APP_TERMINATE_FAILED",
+  MACOS_APP_BUNDLE_ID_MISMATCH: "MACOS_APP_BUNDLE_ID_MISMATCH",
+  MACOS_APP_OPEN_URL_FAILED: "MACOS_APP_OPEN_URL_FAILED",
+  MACOS_APP_FILE_ACCESS_FAILED: "MACOS_APP_FILE_ACCESS_FAILED",
   KEYBOARD_KEY_UNSUPPORTED: "KEYBOARD_KEY_UNSUPPORTED",
   KEYBOARD_CHARACTER_UNSUPPORTED: "KEYBOARD_CHARACTER_UNSUPPORTED",
   KEYBOARD_TEXT_AND_KEY_COMBINED: "KEYBOARD_TEXT_AND_KEY_COMBINED",
@@ -26025,6 +26070,8 @@ var FAILURE_CODES = {
   SCREENSHOT_DIFF_INPUT_INVALID: "SCREENSHOT_DIFF_INPUT_INVALID",
   BOOT_DEVICE_TARGET_SELECTION_INVALID: "BOOT_DEVICE_TARGET_SELECTION_INVALID",
   BOOT_IOS_UNSUPPORTED_HOST: "BOOT_IOS_UNSUPPORTED_HOST",
+  BOOT_IOS_SIMCTL_LIST_TIMEOUT: "BOOT_IOS_SIMCTL_LIST_TIMEOUT",
+  BOOT_IOS_SIMCTL_TIMEOUT: "BOOT_IOS_SIMCTL_TIMEOUT",
   BOOT_ANDROID_NO_AVDS: "BOOT_ANDROID_NO_AVDS",
   BOOT_ANDROID_AVD_NOT_FOUND: "BOOT_ANDROID_AVD_NOT_FOUND",
   BOOT_ANDROID_ADB_UNAVAILABLE: "BOOT_ANDROID_ADB_UNAVAILABLE",
@@ -27139,7 +27186,8 @@ async function consumeToolStream(name, body, onProgress, signal) {
       final = {
         data: msg.data,
         note: msg.note,
-        ...msg.profiling === true ? { profiling: true } : {}
+        ...msg.profiling === true ? { profiling: true } : {},
+        ...typeof msg.failure === "string" ? { failure: msg.failure } : {}
       };
     } else if (msg.event === "error") {
       throw new ToolInvocationError(msg.error ?? "tool invocation failed", {
@@ -27191,7 +27239,8 @@ async function consumeToolStream(name, body, onProgress, signal) {
   return {
     data: final.data,
     note: final.note,
-    ...final.profiling ? { profiling: true } : {}
+    ...final.profiling ? { profiling: true } : {},
+    ...final.failure !== void 0 ? { failure: final.failure } : {}
   };
 }
 function errorBodyMessage(body) {
@@ -27356,6 +27405,7 @@ function createToolsClient(options = {}) {
     }
     const shadowWarning = await e2eShadowWarningFor(name, args);
     const baselineDirs = [];
+    let unwrittenBaselines = [];
     if (meta2?.fileInputs?.length) {
       if (remote) assertRequiredPresent(meta2, finalArgs);
       finalArgs = await prepareFileInputs(meta2.fileInputs, finalArgs ?? {}, {
@@ -27369,8 +27419,9 @@ function createToolsClient(options = {}) {
         signal: opts?.signal
       });
     }
-    const settle2 = async (data) => {
-      const applied = await applyClientFileDirectives(data, { allowedDirs: baselineDirs });
+    const settle2 = async (data2) => {
+      const applied = await applyClientFileDirectives(data2, { allowedDirs: baselineDirs });
+      unwrittenBaselines = applied.failed.map((f) => f.path);
       for (const { path: file, error: error2 } of applied.failed) {
         diagnose(`The baseline ${file} was not written on this client: ${error2}`);
       }
@@ -27387,6 +27438,7 @@ function createToolsClient(options = {}) {
       }
       return { ...result, warning: shadowWarning };
     };
+    const unwrittenFailure = () => unwrittenBaselines.length > 0 ? `Baselines not written on this client: ${unwrittenBaselines.join(", ")}` : void 0;
     const stream = opts?.onProgress !== void 0 || carriesMembers(finalArgs);
     const sentOnce = carriesUpload(finalArgs);
     const forwarded = remote ? await forwardedSecrets(finalArgs) : void 0;
@@ -27450,11 +27502,14 @@ function createToolsClient(options = {}) {
         }),
         opts?.signal
       );
+      const data2 = await settle2(streamed.data);
+      const failure3 = streamed.failure ?? unwrittenFailure();
       return {
-        data: await settle2(streamed.data),
+        data: data2,
         note: streamed.note,
         outputHint: meta2?.outputHint,
-        ...streamed.profiling ? { profiling: true } : {}
+        ...streamed.profiling ? { profiling: true } : {},
+        ...failure3 !== void 0 ? { failure: failure3 } : {}
       };
     }
     let json;
@@ -27490,11 +27545,14 @@ function createToolsClient(options = {}) {
       });
     }
     opts?.signal?.throwIfAborted();
+    const data = await settle2(json.data);
+    const failure2 = (typeof json.failure === "string" ? json.failure : void 0) ?? unwrittenFailure();
     return {
-      data: await settle2(json.data),
+      data,
       note: json.note,
       outputHint: meta2?.outputHint,
-      ...json.profiling === true ? { profiling: true } : {}
+      ...json.profiling === true ? { profiling: true } : {},
+      ...failure2 !== void 0 ? { failure: failure2 } : {}
     };
   }
   return { fetchTools, fetchTool, callTool, baseUrl };
@@ -27786,7 +27844,8 @@ var PLATFORMS = [
   "vega",
   "harmony",
   "tvos",
-  "android-tv"
+  "android-tv",
+  "macos"
 ];
 var DEVICE_KINDS = [
   "simulator",
@@ -27960,6 +28019,9 @@ var ALLOWED = {
     warned_count: COUNT
   },
   "installation:skill_install": {
+    source: oneOf(["pinned", "bundled"]),
+    used_fallback: bool,
+    fallback_reason: oneOf(["ref_missing", "unclassified"]),
     method: oneOf(["default", "interactive", "manual"]),
     is_online: bool,
     has_offline_cache: bool,
@@ -28844,7 +28906,9 @@ var AUTO_SCREENSHOT_TOOLS = /* @__PURE__ */ new Set([
   "describe",
   "run-sequence",
   // A wait is almost always followed by a look at the screen it waited for.
-  "await-ui-element"
+  "await-ui-element",
+  "file-panel",
+  "menu-bar"
 ]);
 var AUTO_SCREENSHOT_DELAY_MS_BY_TOOL = {
   "launch-app": 3e3,
@@ -28892,15 +28956,18 @@ var AUTO_DESCRIBE_TOOLS = /* @__PURE__ */ new Set([
   "restart-app",
   "open-url",
   "run-sequence",
-  "await-ui-element"
+  "await-ui-element",
+  "file-panel",
+  "menu-bar"
 ]);
 function autoDescribeEnabled(options) {
   return !isFlagEnabled("disable-auto-describe", options);
 }
 var PROFILING_CAPTURE_SKIPPED_NOTE = "Auto-screenshot and element tree skipped while a profiler is recording on this device. Call screenshot or describe if you need to see the screen.";
 var AUTO_DESCRIBE_HEADER = "--- Elements after action (describe) ---";
-function shouldAutoDescribe(toolName) {
-  return AUTO_DESCRIBE_TOOLS.has(normalizeToolName(toolName));
+function shouldAutoDescribe(toolName, args) {
+  const canonical = normalizeToolName(toolName);
+  return AUTO_DESCRIBE_TOOLS.has(canonical) && !isListCall(canonical, args);
 }
 var SECRET_PLACEHOLDER_MARKER = "{{secret:";
 function containsSecretPlaceholder(args) {
@@ -28920,9 +28987,12 @@ function normalizeToolName(name) {
   const idx = name.lastIndexOf("__");
   return idx === -1 ? name : name.slice(idx + 2);
 }
-function shouldAutoScreenshot(toolName) {
+function shouldAutoScreenshot(toolName, args) {
   const canonical = normalizeToolName(toolName);
-  return canonical !== "screenshot" && AUTO_SCREENSHOT_TOOLS.has(canonical);
+  return canonical !== "screenshot" && AUTO_SCREENSHOT_TOOLS.has(canonical) && !isListCall(canonical, args);
+}
+function isListCall(canonical, args) {
+  return (canonical === "menu-bar" || canonical === "file-panel") && args?.action === "list";
 }
 function getAutoScreenshotDelayMs(toolName) {
   const canonical = normalizeToolName(toolName);
@@ -29100,6 +29170,78 @@ function toMcpToolList(tools, options = {}) {
   return tools.filter((t) => !t.hideFromMcp).map((t) => toMcpTool(t, options));
 }
 
+// ../argent-mcp/src/list-devices-text.ts
+var RUNTIME_PREFIX = "com.apple.CoreSimulator.SimRuntime.";
+var STOPPED_SIMULATORS_HEADER = "iOS simulators that are shut down, one per line (platform, udid, name, runtime, state, tags); start one with boot-device:";
+function isRecord3(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function shortRuntime(runtime) {
+  if (!runtime.startsWith(RUNTIME_PREFIX)) return runtime;
+  const rest = runtime.slice(RUNTIME_PREFIX.length);
+  const match = /^([A-Za-z]+)-(\d+(?:-\d+)*)$/.exec(rest);
+  return match ? `${match[1]} ${match[2].replace(/-/g, ".")}` : rest;
+}
+function cleanEntry(device) {
+  const out = {};
+  for (const [key, value] of Object.entries(device)) {
+    if (value === null || value === void 0) continue;
+    if (key === "isEmulator") continue;
+    if (key === "runtimeKind" && value === "mobile") continue;
+    out[key] = key === "runtime" && typeof value === "string" ? shortRuntime(value) : value;
+  }
+  return out;
+}
+function isStoppedSimulator(device) {
+  if (device.platform !== "ios" && device.platform !== "ios-remote") return false;
+  if ("kind" in device || "external" in device) return false;
+  return typeof device.udid === "string" && device.state === "Shutdown";
+}
+var ONE_LINE_FIELDS = /* @__PURE__ */ new Set(["platform", "udid", "name", "runtime", "state"]);
+function quoteIfNeeded(value) {
+  return value === "" || /[\s"\\]/.test(value) ? JSON.stringify(value) : value;
+}
+function stoppedSimulatorLine(device) {
+  const d = cleanEntry(device);
+  const name = typeof d.name === "string" ? d.name : "";
+  const parts = [String(d.platform), String(d.udid), JSON.stringify(name)];
+  if (typeof d.runtime === "string") parts.push(d.runtime);
+  if (typeof d.state === "string") parts.push(quoteIfNeeded(d.state));
+  for (const [key, value] of Object.entries(d)) {
+    if (ONE_LINE_FIELDS.has(key)) continue;
+    if (value === true) parts.push(key);
+    else if (typeof value === "string" || typeof value === "number")
+      parts.push(`${key}=${quoteIfNeeded(String(value))}`);
+    else parts.push(`${key}=${JSON.stringify(value)}`);
+  }
+  return parts.join(" ");
+}
+function listDevicesText(result) {
+  if (!isRecord3(result) || !Array.isArray(result.devices)) return void 0;
+  if (!result.devices.every(isRecord3)) return void 0;
+  const devices = result.devices;
+  const listed = [];
+  const stopped = [];
+  for (const device of devices) {
+    if (isStoppedSimulator(device)) stopped.push(stoppedSimulatorLine(device));
+    else listed.push(JSON.stringify(cleanEntry(device)));
+  }
+  const rest = [];
+  for (const [key, value] of Object.entries(result)) {
+    if (key === "devices") continue;
+    rest.push(`${JSON.stringify(key)}:${JSON.stringify(value)}`);
+  }
+  const devicesPart = listed.length > 0 ? `[
+${listed.join(",\n")}
+]` : "[]";
+  const object3 = `{"devices":${devicesPart}${rest.map((r) => `,
+${r}`).join("")}}`;
+  if (stopped.length === 0) return object3;
+  return `${object3}
+${STOPPED_SIMULATORS_HEADER}
+${stopped.join("\n")}`;
+}
+
 // ../argent-mcp/src/instructions.ts
 var SERVER_INSTRUCTIONS = "Argent \u2014 iOS Simulator, Android Emulator, and Chromium app control for interacting, testing, profiling and debugging mobile and Chromium applications. Interaction tools return the screen after the action: a screenshot plus the accessibility element tree with normalized tap frames. Take coordinates from that tree; call describe only when no fresh tree is available \u2014 never guess coordinates from pixels. Do not stop simulator servers when a task finishes: the next task reuses them. Call stop-all-simulator-servers when the user asks to clean up or ends the session, or when a skill tells you to recycle a device's services, always with devices: [...] naming the devices this session used. Never stop a Metro the user started unless they ask. One tool-server is shared by every agent using this argent install, so an unscoped call tears down their devices too \u2014 reserve it for a deliberate machine-wide cleanup.";
 
@@ -29337,7 +29479,7 @@ async function startMcpServer(options) {
     const t1 = Date.now();
     try {
       const d = await callTool("describe", { udid }, { signal });
-      const desc = d.result?.description;
+      const { description: desc, hint } = d.result ?? {};
       await spyLog({
         ts: (/* @__PURE__ */ new Date()).toISOString(),
         event: "auto_describe",
@@ -29346,8 +29488,10 @@ async function startMcpServer(options) {
         chars: typeof desc === "string" ? desc.length : 0
       });
       if (typeof desc !== "string" || desc.length === 0) return [];
+      const hintLine = typeof hint === "string" && hint && !desc.includes(hint) ? `Hint: ${hint}
+` : "";
       return [{ type: "text", text: `${AUTO_DESCRIBE_HEADER}
-${desc}` }];
+${hintLine}${desc}` }];
     } catch (e) {
       await spyLog({
         ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -29408,8 +29552,11 @@ ${desc}` }];
         authToken: AUTH_TOKEN,
         deviceId: getDeviceIdFromArgs(params.arguments)
       };
+      const devicesText = canonicalToolId(params.name) === "list-devices" ? listDevicesText(result) : void 0;
       let content;
-      if (canonicalToolId(params.name) === "e2e-execute" && result && typeof result === "object" && ("e2eTest" in result || "flow" in result) && "steps" in result) {
+      if (devicesText !== void 0) {
+        content = [{ type: "text", text: devicesText }];
+      } else if (canonicalToolId(params.name) === "e2e-execute" && result && typeof result === "object" && ("e2eTest" in result || "flow" in result) && "steps" in result) {
         content = await flowRunToMcpContent(result, ctx);
       } else if (params.name === "screenshot-diff" && isScreenshotDiffResult(result)) {
         content = await screenshotDiffToMcpContent(result, ctx);
@@ -29417,8 +29564,8 @@ ${desc}` }];
         content = await toMcpContent(result, outputHint, ctx, params.arguments);
       }
       const udid = getUdidFromArgs(params.arguments);
-      const wantScreenshot = autoScreenshotOn && shouldAutoScreenshot(params.name);
-      const wantTree = autoDescribeOn && shouldAutoDescribe(params.name);
+      const wantScreenshot = autoScreenshotOn && shouldAutoScreenshot(params.name, params.arguments);
+      const wantTree = autoDescribeOn && shouldAutoDescribe(params.name, params.arguments);
       if (udid && (wantScreenshot || wantTree) && containsSecretPlaceholder(params.arguments)) {
         content = [
           ...content,