@swmansion/argent 0.15.1-next.13 → 0.15.1-next.2

package/dist/tool-server.cjs

@@ -314,10 +314,10 @@ var init_failure_codes = __esm({
       ANDROID_UIAUTOMATOR_PARSE_FAILED: "ANDROID_UIAUTOMATOR_PARSE_FAILED",
       ANDROID_UIAUTOMATOR_CAPTURE_FAILED: "ANDROID_UIAUTOMATOR_CAPTURE_FAILED",
       DEBUGGER_METRO_NOT_RUNNING: "DEBUGGER_METRO_NOT_RUNNING",
+      DEBUGGER_METRO_PROJECT_ROOT_MISSING: "DEBUGGER_METRO_PROJECT_ROOT_MISSING",
       DEBUGGER_METRO_NO_TARGETS: "DEBUGGER_METRO_NO_TARGETS",
       DEBUGGER_CDP_RUNTIME_EXCEPTION: "DEBUGGER_CDP_RUNTIME_EXCEPTION",
       DEBUGGER_CDP_BINDING_TIMEOUT: "DEBUGGER_CDP_BINDING_TIMEOUT",
-      DEBUGGER_CDP_BINDING_UNAVAILABLE: "DEBUGGER_CDP_BINDING_UNAVAILABLE",
       DEBUGGER_CDP_PROTOCOL_ERROR: "DEBUGGER_CDP_PROTOCOL_ERROR",
       DEBUGGER_RELOAD_FAILED: "DEBUGGER_RELOAD_FAILED",
       JS_RUNTIME_CONSOLE_SERVER_BIND_FAILED: "JS_RUNTIME_CONSOLE_SERVER_BIND_FAILED",
@@ -404,7 +404,6 @@ var init_failure_codes = __esm({
       CHROMIUM_ELECTRON_EXITED_BEFORE_READY: "CHROMIUM_ELECTRON_EXITED_BEFORE_READY",
       KEYBOARD_KEY_UNSUPPORTED: "KEYBOARD_KEY_UNSUPPORTED",
       KEYBOARD_CHARACTER_UNSUPPORTED: "KEYBOARD_CHARACTER_UNSUPPORTED",
-      SECRET_PLACEHOLDER_UNKNOWN: "SECRET_PLACEHOLDER_UNKNOWN",
       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",
@@ -103836,8 +103835,6 @@ var ALLOWED = {
     action: PACKAGE_ACTION,
     is_success: bool,
     duration_ms: DURATION_MS,
-    retry_count: COUNT,
-    last_attempt_duration_ms: DURATION_MS,
     ...FAILURE_SIGNAL2
   },
   "installation:cli_update_start": {},
@@ -104399,7 +104396,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.16.0";
+    return "0.15.0";
   }
   return "0.0.0";
 }
@@ -105764,7 +105761,7 @@ var import_node_path4 = __toESM(require("node:path"));
 var import_semver = __toESM(require_semver2());
 
 // ../tool-server/package.json
-var version3 = "0.16.0";
+var version3 = "0.15.0";
 
 // ../tool-server/src/utils/update-checker.ts
 var import_update_core = __toESM(require_dist4());
@@ -114409,8 +114406,6 @@ var CDPClient = class {
   nextId = 1;
   pending = /* @__PURE__ */ new Map();
   pendingBindings = /* @__PURE__ */ new Map();
-  /** Set by addBinding when the runtime ACKs the command but installs nothing. */
-  bindingUnavailable = false;
   scripts = /* @__PURE__ */ new Map();
   enabledDomains = /* @__PURE__ */ new Set();
   wsUrl;
@@ -114543,8 +114538,6 @@ var CDPClient = class {
   }
   async addBinding(name) {
     await this.send("Runtime.addBinding", { name });
-    const probe3 = await this.evaluate(`typeof ${name}`).catch(() => void 0);
-    this.bindingUnavailable = probe3 === "undefined";
   }
   /**
    * Inject a script that will push a result via the binding using a unique requestId.
@@ -114553,19 +114546,6 @@ var CDPClient = class {
   evaluateWithBinding(expression, requestId, options) {
     const id = requestId ?? crypto3.randomUUID();
     const timeout = options?.timeout ?? DEFAULT_TIMEOUT_MS2;
-    if (this.bindingUnavailable) {
-      return Promise.reject(
-        new FailureError(
-          "This JS runtime acknowledges Runtime.addBinding but never installs the binding (legacy Hermes, React Native <= 0.72), so it cannot deliver a result over the binding channel. Tools that read the React tree this way are unavailable here; use `describe` to read on-screen structure.",
-          {
-            error_code: FAILURE_CODES.DEBUGGER_CDP_BINDING_UNAVAILABLE,
-            failure_stage: "debugger_cdp_binding",
-            failure_area: "tool_server",
-            error_kind: "unsupported"
-          }
-        )
-      );
-    }
     return new Promise((resolve7, reject) => {
       const timer = setTimeout(() => {
         this.pendingBindings.delete(id);
@@ -122002,14 +121982,12 @@ init_src();
 
 // ../tool-server/src/utils/debugger/discovery.ts
 init_src();
-var DECOY_VM = "don't use";
 async function discoverMetro(port) {
-  let statusRes;
-  try {
-    statusRes = await fetch(`http://localhost:${port}/status`);
-  } catch (err) {
+  const statusRes = await fetch(`http://localhost:${port}/status`);
+  const statusText = await statusRes.text();
+  if (!statusText.includes("packager-status:running")) {
     throw new FailureError(
-      `Metro at port ${port} is not running (got: ${err instanceof Error ? err.message : String(err)})`,
+      `Metro at port ${port} is not running (got: ${statusText.slice(0, 100)})`,
       {
         error_code: FAILURE_CODES.DEBUGGER_METRO_NOT_RUNNING,
         failure_stage: "debugger_discover_metro_status",
@@ -122018,25 +121996,21 @@ async function discoverMetro(port) {
       }
     );
   }
-  const statusText = await statusRes.text();
-  if (!statusText.includes("packager-status:running")) {
+  const projectRoot = statusRes.headers.get("X-React-Native-Project-Root") ?? "";
+  if (!projectRoot) {
     throw new FailureError(
-      `Metro at port ${port} is not running (got: ${statusText.slice(0, 100)})`,
+      `Metro at port ${port} did not return X-React-Native-Project-Root header`,
       {
-        error_code: FAILURE_CODES.DEBUGGER_METRO_NOT_RUNNING,
-        failure_stage: "debugger_discover_metro_status",
+        error_code: FAILURE_CODES.DEBUGGER_METRO_PROJECT_ROOT_MISSING,
+        failure_stage: "debugger_discover_metro_project_root",
         failure_area: "tool_server",
         error_kind: "network"
       }
     );
   }
-  const projectRoot = statusRes.headers.get("X-React-Native-Project-Root") ?? "";
   const listRes = await fetch(`http://localhost:${port}/json/list`);
-  const parsed = await listRes.json().catch(() => null);
-  const targets = (Array.isArray(parsed) ? parsed : []).filter(
-    (t) => t?.vm !== DECOY_VM
-  );
-  if (!targets.length) {
+  const targets = await listRes.json();
+  if (!targets?.length) {
     throw new FailureError(
       `Metro at port ${port} has no CDP targets \u2014 is a React Native app connected?`,
       {
@@ -122051,19 +122025,8 @@ async function discoverMetro(port) {
 }
 
 // ../tool-server/src/utils/debugger/target-selection.ts
-function deviceKey(target) {
-  const logicalId = target.reactNative?.logicalDeviceId;
-  if (logicalId) return logicalId;
-  try {
-    const device = new URL(target.webSocketDebuggerUrl).searchParams.get("device");
-    if (device) return `device=${device}`;
-  } catch {
-  }
-  return target.deviceName;
-}
 function selectTarget(targets, port, options) {
-  const pool = targets;
-  let candidates = pool;
+  let candidates = targets;
   if (typeof options?.deviceId === "string" && options.deviceId) {
     const deviceId = options.deviceId;
     const filtered = candidates.filter((t) => t.reactNative?.logicalDeviceId === deviceId);
@@ -122071,21 +122034,16 @@ function selectTarget(targets, port, options) {
       candidates = filtered;
     } else {
       const distinctDevices = /* @__PURE__ */ new Map();
-      for (const t of pool) {
-        const key = deviceKey(t);
-        if (key && !distinctDevices.has(key)) {
-          distinctDevices.set(key, {
-            name: t.deviceName,
-            logicalId: t.reactNative?.logicalDeviceId
-          });
+      for (const t of targets) {
+        const id = t.reactNative?.logicalDeviceId;
+        if (id !== void 0 && id !== "" && !distinctDevices.has(id)) {
+          distinctDevices.set(id, t.deviceName);
         }
       }
       if (distinctDevices.size > 1) {
-        const listed = [...distinctDevices.values()].map(
-          (d) => d.logicalId ? `${d.name ?? "unknown"} (${d.logicalId})` : `${d.name ?? "unknown"} (legacy inspector \u2014 no logicalDeviceId)`
-        ).join(", ");
+        const listed = [...distinctDevices.entries()].map(([id, name]) => name ? `${name} (${id})` : id).join(", ");
         throw new Error(
-          `No debugger target matches device_id "${deviceId}". ${distinctDevices.size} devices are connected to Metro on port ${port}: ${listed}. Re-target with the logicalDeviceId in parentheses \u2014 that is what debugger-connect returns and what subsequent debugger-* calls must pass. A legacy-inspector device (RN 0.72 / Vega) reports none and cannot be singled out of a shared Metro: give it its own Metro port.`
+          `No debugger target matches device_id "${deviceId}". ${distinctDevices.size} devices are connected to Metro on port ${port}: ${listed}. Pass the logicalDeviceId (in parentheses) of the desired device as device_id (the logicalDeviceId returned by debugger-connect).`
         );
       }
     }
@@ -122226,7 +122184,6 @@ function parseNode(line) {
 // ../tool-server/src/utils/debugger/source-resolver.ts
 var ALLOWED_SOURCE_EXTENSIONS = /* @__PURE__ */ new Set([".js", ".jsx", ".ts", ".tsx", ".mjs", ".cjs"]);
 function isInsideProject(absFile, projectRoot) {
-  if (!projectRoot) return false;
   const resolvedRoot = path17.resolve(projectRoot);
   const resolvedFile = path17.resolve(absFile);
   const rel = path17.relative(resolvedRoot, resolvedFile);
@@ -122269,7 +122226,7 @@ function createSourceResolver(port, projectRoot) {
       const frame = data.stack?.[0];
       if (!frame?.file) return null;
       if (/^https?:\/\//.test(frame.file)) return null;
-      const relFile = projectRoot ? frame.file.replace(projectRoot + "/", "").replace(/^\/+/, "") : frame.file;
+      const relFile = frame.file.replace(projectRoot + "/", "").replace(/^\/+/, "");
       return {
         file: relFile,
         line: frame.lineNumber ?? 0,
@@ -122288,7 +122245,6 @@ function createSourceResolver(port, projectRoot) {
     },
     symbolicate: symbolicateFrame,
     async readSourceFragment(location, contextLines = 3) {
-      if (!projectRoot) return null;
       try {
         const absPath = path17.isAbsolute(location.file) ? path17.resolve(location.file) : path17.resolve(projectRoot, location.file);
         const realRoot = await fs18.realpath(projectRoot);
@@ -126146,10 +126102,7 @@ var sleep2 = (ms) => new Promise((r) => setTimeout(r, ms));
 var zodSchema16 = external_exports.object({
   udid: external_exports.string().describe("Target device id from `list-devices` (iOS UDID, Android serial, or Chromium id)."),
   x: external_exports.number().describe("Normalized horizontal position 0.0\u20131.0 (left=0, right=1), not pixels"),
-  y: external_exports.number().describe("Normalized vertical position 0.0\u20131.0 (top=0, bottom=1), not pixels"),
-  clickCount: external_exports.number().int().min(1).max(10).optional().describe(
-    "Number of taps/clicks dispatched as ONE multi-tap gesture (2 = double-tap / double-click). The taps land inside the OS double-tap window; on Chromium each click carries an escalating CDP clickCount so dblclick actually fires. Default 1."
-  )
+  y: external_exports.number().describe("Normalized vertical position 0.0\u20131.0 (top=0, bottom=1), not pixels")
 });
 var capability8 = {
   apple: { simulator: true, device: true },
@@ -126157,25 +126110,19 @@ var capability8 = {
   android: { emulator: true, device: true, unknown: true },
   chromium: { app: true }
 };
-var TAP_HOLD_MS = 50;
-var MULTI_TAP_GAP_MS = 100;
-async function tapChromium(api, x, y, clickCount) {
+async function tapChromium(api, x, y) {
   const vp = api.getViewport();
   const pxX = Math.max(0, Math.min(vp.width, x * vp.width));
   const pxY = Math.max(0, Math.min(vp.height, y * vp.height));
   await api.dispatchMouseEvent({ type: "mouseMoved", x: pxX, y: pxY });
-  for (let i = 1; i <= clickCount; i++) {
-    if (i > 1) await sleep2(MULTI_TAP_GAP_MS);
-    await api.dispatchMouseEvent({ type: "mousePressed", x: pxX, y: pxY, clickCount: i });
-    await sleep2(TAP_HOLD_MS);
-    await api.dispatchMouseEvent({ type: "mouseReleased", x: pxX, y: pxY, clickCount: i });
-  }
+  await api.dispatchMouseEvent({ type: "mousePressed", x: pxX, y: pxY, clickCount: 1 });
+  await sleep2(50);
+  await api.dispatchMouseEvent({ type: "mouseReleased", x: pxX, y: pxY, clickCount: 1 });
 }
 var gestureTapTool = {
   id: "gesture-tap",
   description: `Press the device screen (iOS simulator, Android emulator, or Chromium app) at normalized coordinates: x and y are fractions of screen width and height in 0.0\u20131.0 (not pixels).
 Sends a Down event followed by an Up event at the same point. For Chromium, this dispatches a CDP mouse-press/release on the renderer.
-Set clickCount: 2 for a double-tap / double-click \u2014 the taps are dispatched as one gesture with proper click counting, which two separate tap calls cannot guarantee.
 Use when you need to tap a button, link, or any tappable element on the screen.
 Returns { tapped: true, timestampMs }. Fails if the simulator-server / emulator backend / Chromium CDP is not reachable for the given device.
 Before tapping, determine the correct coordinates by using discovery tools \u2014 pick by platform: iOS / Android use \`describe\`, \`native-describe-screen\`, or \`debugger-component-tree\`; Chromium uses \`describe\` (the DOM walker), since the native and RN-specific discovery tools don't apply. More information in \`argent-device-interact\` skill`,
@@ -126193,33 +126140,29 @@ Before tapping, determine the correct coordinates by using discovery tools \u201
   async execute(services, params) {
     const device = resolveDevice(params.udid);
     const timestampMs = Date.now();
-    const clickCount = params.clickCount ?? 1;
     if (device.platform === "chromium") {
       const chromium = services.chromium;
-      await tapChromium(chromium, params.x, params.y, clickCount);
+      await tapChromium(chromium, params.x, params.y);
       return { tapped: true, timestampMs };
     }
     const api = services.simulatorServer;
-    for (let i = 1; i <= clickCount; i++) {
-      if (i > 1) await sleep2(MULTI_TAP_GAP_MS);
-      sendCommand(api, {
-        cmd: "touch",
-        type: "Down",
-        x: params.x,
-        y: params.y,
-        second_x: null,
-        second_y: null
-      });
-      await sleep2(TAP_HOLD_MS);
-      sendCommand(api, {
-        cmd: "touch",
-        type: "Up",
-        x: params.x,
-        y: params.y,
-        second_x: null,
-        second_y: null
-      });
-    }
+    sendCommand(api, {
+      cmd: "touch",
+      type: "Down",
+      x: params.x,
+      y: params.y,
+      second_x: null,
+      second_y: null
+    });
+    await sleep2(50);
+    sendCommand(api, {
+      cmd: "touch",
+      type: "Up",
+      x: params.x,
+      y: params.y,
+      second_x: null,
+      second_y: null
+    });
     return { tapped: true, timestampMs };
   }
 };
@@ -126731,54 +126674,6 @@ Fails if the device backend is not reachable \u2014 the simulator-server for iOS
 // ../tool-server/src/tools/keyboard/index.ts
 init_zod();
 
-// ../tool-server/src/utils/secrets.ts
-init_src();
-var SECRET_ENV_PREFIX = "ARGENT_SECRET_";
-var SECRET_PLACEHOLDER_MARKER = "{{secret:";
-var PLACEHOLDER_RE = /\{\{secret:([A-Za-z_][A-Za-z0-9_]*)\}\}/g;
-function availableSecretNames(env = process.env) {
-  return Object.keys(env).filter((k) => k.startsWith(SECRET_ENV_PREFIX) && env[k] !== void 0).map((k) => k.slice(SECRET_ENV_PREFIX.length)).sort();
-}
-var REDUNDANT_PREFIX_RE = /^argent_secret_/i;
-function resolveSecretPlaceholders(text, env = process.env) {
-  const secrets = [];
-  const resolved = text.replace(PLACEHOLDER_RE, (placeholder, rawName) => {
-    let name = rawName;
-    let value = env[SECRET_ENV_PREFIX + name];
-    if (value === void 0 && REDUNDANT_PREFIX_RE.test(name)) {
-      name = name.replace(REDUNDANT_PREFIX_RE, "");
-      value = env[SECRET_ENV_PREFIX + name];
-    }
-    if (value === void 0) {
-      const names = availableSecretNames(env);
-      throw new InvalidToolInputError(
-        `Unknown secret "${rawName}" \u2014 no ${SECRET_ENV_PREFIX}${name} environment variable is set on the machine running the tool-server. Available secrets: ${names.length ? names.join(", ") : "(none)"}. To make it available, ask the user to export ${SECRET_ENV_PREFIX}${name} in the tool-server's environment \u2014 never ask the user for the secret value itself.`,
-        {
-          error_code: FAILURE_CODES.SECRET_PLACEHOLDER_UNKNOWN,
-          failure_stage: "secret_placeholder_resolution",
-          error_kind: "validation"
-        }
-      );
-    }
-    if (!secrets.some((s) => s.name === name)) secrets.push({ name, value });
-    return value;
-  });
-  return { text: resolved, secrets };
-}
-function redactSecretsFromError(err, secrets) {
-  const scrub = (s) => secrets.reduce(
-    (acc, { name, value }) => value ? acc.split(value).join(`${SECRET_PLACEHOLDER_MARKER}${name}}}`) : acc,
-    s
-  );
-  if (err instanceof Error) {
-    err.message = scrub(err.message);
-    if (err.stack) err.stack = scrub(err.stack);
-    return err;
-  }
-  if (typeof err === "string") return scrub(err);
-  return err;
-}
-
 // ../tool-server/src/tools/keyboard/simulator-server-keys.ts
 init_src();
 
@@ -126889,11 +126784,10 @@ async function typeSimulatorServer(registry2, device, params) {
     }
     keysPressed++;
   };
-  let namedKeyCode;
   if (params.key) {
     const lower = params.key.toLowerCase();
-    namedKeyCode = Object.hasOwn(NAMED_KEYS, lower) ? NAMED_KEYS[lower] : void 0;
-    if (namedKeyCode == null) {
+    const code = Object.hasOwn(NAMED_KEYS, lower) ? NAMED_KEYS[lower] : void 0;
+    if (code == null) {
       throw new InvalidToolInputError(
         `Unknown key "${params.key}". Supported: ${Object.keys(NAMED_KEYS).join(", ")}`,
         {
@@ -126903,6 +126797,7 @@ async function typeSimulatorServer(registry2, device, params) {
         }
       );
     }
+    await pressKeyCode(code);
   }
   if (params.text) {
     for (const char of params.text) {
@@ -126917,9 +126812,6 @@ async function typeSimulatorServer(registry2, device, params) {
       await sleep8(delay2);
     }
   }
-  if (namedKeyCode != null) {
-    await pressKeyCode(namedKeyCode);
-  }
   return { typed: params.text ?? params.key ?? "", keys: keysPressed };
 }
 
@@ -127063,10 +126955,9 @@ var sleep9 = (ms) => new Promise((r) => setTimeout(r, ms));
 async function runChromium(api, params) {
   const delay2 = params.delayMs ?? 50;
   let keysPressed = 0;
-  let named;
   if (params.key) {
     const lower = params.key.toLowerCase();
-    named = Object.hasOwn(CHROMIUM_NAMED_KEYS, lower) ? CHROMIUM_NAMED_KEYS[lower] : void 0;
+    const named = Object.hasOwn(CHROMIUM_NAMED_KEYS, lower) ? CHROMIUM_NAMED_KEYS[lower] : void 0;
     if (!named) {
       throw new InvalidToolInputError(
         `Unknown key "${params.key}". Supported: ${Object.keys(CHROMIUM_NAMED_KEYS).join(", ")}`,
@@ -127077,6 +126968,20 @@ async function runChromium(api, params) {
         }
       );
     }
+    await api.dispatchKeyEvent({
+      type: "keyDown",
+      key: named.key,
+      code: named.code,
+      windowsVirtualKeyCode: named.windowsVirtualKeyCode
+    });
+    await sleep9(delay2);
+    await api.dispatchKeyEvent({
+      type: "keyUp",
+      key: named.key,
+      code: named.code,
+      windowsVirtualKeyCode: named.windowsVirtualKeyCode
+    });
+    keysPressed++;
   }
   if (params.text) {
     for (const char of params.text) {
@@ -127105,22 +127010,6 @@ async function runChromium(api, params) {
       await sleep9(delay2);
     }
   }
-  if (named) {
-    await api.dispatchKeyEvent({
-      type: "keyDown",
-      key: named.key,
-      code: named.code,
-      windowsVirtualKeyCode: named.windowsVirtualKeyCode
-    });
-    await sleep9(delay2);
-    await api.dispatchKeyEvent({
-      type: "keyUp",
-      key: named.key,
-      code: named.code,
-      windowsVirtualKeyCode: named.windowsVirtualKeyCode
-    });
-    keysPressed++;
-  }
   return { typed: params.text ?? params.key ?? "", keys: keysPressed };
 }
 function makeChromiumImpl(registry2) {
@@ -127204,7 +127093,7 @@ async function injectViaInputd(subcommands) {
 async function injectVegaButtons(buttons) {
   await injectViaInputd(remoteButtonsToKeycodes(buttons).map((code) => `button_press ${code}`));
 }
-function resolveVegaNamedKeycode(name) {
+async function injectVegaNamedKey(name) {
   const lower = name.toLowerCase();
   const code = Object.hasOwn(NAMED_KEYCODES, lower) ? NAMED_KEYCODES[lower] : void 0;
   if (!code) {
@@ -127217,10 +127106,7 @@ function resolveVegaNamedKeycode(name) {
       }
     );
   }
-  return code;
-}
-async function injectVegaNamedKey(name) {
-  await injectViaInputd([`button_press ${resolveVegaNamedKeycode(name)}`]);
+  await injectViaInputd([`button_press ${code}`]);
 }
 async function injectVegaText(text) {
   if (/[\n\r]/.test(text)) {
@@ -127236,15 +127122,14 @@ async function injectVegaText(text) {
 // ../tool-server/src/tools/keyboard/platforms/vega.ts
 async function runVega2(params) {
   let keysPressed = 0;
-  if (params.key) resolveVegaNamedKeycode(params.key);
-  if (params.text) {
-    await injectVegaText(params.text);
-    keysPressed += [...params.text].length;
-  }
   if (params.key) {
     await injectVegaNamedKey(params.key);
     keysPressed++;
   }
+  if (params.text) {
+    await injectVegaText(params.text);
+    keysPressed += [...params.text].length;
+  }
   return { typed: params.text ?? params.key ?? "", keys: keysPressed };
 }
 var vegaImpl4 = {
@@ -127257,11 +127142,9 @@ var zodSchema24 = external_exports.object({
   udid: external_exports.string().describe(
     "Target device id from `list-devices` (iOS UDID, Android serial, Vega serial, or Chromium id)."
   ),
-  text: external_exports.string().optional().describe(
-    'Text to type character by character. Handles uppercase and common punctuation. To type a credential without its plaintext ever entering your context, use a secret placeholder: `{{secret:<NAME>}}` types the value of the `ARGENT_SECRET_<NAME>` environment variable set on the machine running the tool-server \u2014 e.g. text: "{{secret:APP_PASSWORD}}" types the value of `ARGENT_SECRET_APP_PASSWORD`. Only env vars with the `ARGENT_SECRET_` prefix are resolvable. Placeholders can be embedded in longer text and are never echoed back resolved. If the secret you need is not set, ask the user to export it as `ARGENT_SECRET_<NAME>` and restart the session \u2014 NEVER ask the user to paste the secret value into the conversation.'
-  ),
+  text: external_exports.string().optional().describe("Text to type character by character. Handles uppercase and common punctuation."),
   key: external_exports.string().optional().describe(
-    "Named key to press: enter, escape, backspace, tab, space, arrow-up, arrow-down, arrow-left, arrow-right, f1\u2013f12. When combined with `text`, the key is pressed AFTER the text is typed (so text + enter types and submits). Not supported on TV targets \u2014 move focus with `tv-remote` (up/down/left/right) instead."
+    "Named key to press: enter, escape, backspace, tab, space, arrow-up, arrow-down, arrow-left, arrow-right, f1\u2013f12. Not supported on TV targets \u2014 move focus with `tv-remote` (up/down/left/right) instead."
   ),
   delayMs: external_exports.number().optional().describe(
     "Delay in ms between key presses (default 50). Ignored on Android phones/tablets (typed via `adb input text`, which has no per-key cadence), on Vega (text/keys injected in a single shot), and on TV targets (Apple TV / Android TV type the whole string at the daemon's own cadence)."
@@ -127275,24 +127158,15 @@ var capability16 = {
   vega: { vvd: true }
 };
 function createKeyboardTool(registry2) {
-  const dispatch = dispatchByPlatform({
-    toolId: "keyboard",
-    capability: capability16,
-    ios: makeIosImpl3(registry2),
-    iosRemote: makeIosRemoteImpl(registry2),
-    android: makeAndroidImpl(registry2),
-    chromium: makeChromiumImpl(registry2),
-    vega: vegaImpl4
-  });
   return {
     id: "keyboard",
     description: `Type text or press special keys on the device (iOS simulator, Android emulator or device, Chromium app, Vega Virtual Device, or Apple TV / Android TV) using keyboard events.
 Use when you need to enter text or trigger a named key such as enter, escape, or arrow keys. On Vega and Apple TV / Android TV, prefer the remote tools for D-pad navigation; use keyboard to type into a focused text field (e.g. a search or login box).
 Returns { typed: string, keys: number }. Fails if an unsupported key name is provided or the device's input backend is not reachable.
-- text: types a string (supports uppercase, digits, common punctuation). To type a credential, use \`{{secret:<NAME>}}\` \u2014 resolved server-side from the \`ARGENT_SECRET_<NAME>\` env var (prefix mandatory; \`{{secret:APP_PASSWORD}}\` \u2194 \`ARGENT_SECRET_APP_PASSWORD\`), so the plaintext never enters agent context; the result echoes the placeholder, not the value, and the after-typing auto-screenshot is skipped.
+- text: types a string (supports uppercase, digits, common punctuation)
 - key: presses a single named key (enter, escape, backspace, tab, arrow-up/down/left/right, f1\u2013f12) \u2014 NOT supported on TV targets; move focus with \`tv-remote\` instead.
 On a TV target (runtimeKind 'tv') only \`text\` applies \u2014 focus a text field first (with \`tv-remote\`), then type into it (injected HID keyboard on Apple TV, \`adb input text\` on Android TV).
-Provide text, key, or both \u2014 when both are given, the text is typed first and the key is pressed after it (text + key:"enter" types and submits).`,
+Provide text, key, or both.`,
     zodSchema: zodSchema24,
     capability: capability16,
     searchHint: "type text keyboard input named key enter escape arrow tv vega fire tv search field hid leanback",
@@ -127300,17 +127174,15 @@ Provide text, key, or both \u2014 when both are given, the text is typed first a
     // simulator-server, CDP, or Vega adb), since distinguishing a TV target is
     // async and a tvOS udid must never resolve simulator-server.
     services: () => ({}),
-    execute: async (services, params, options) => {
-      if (params.text === void 0) return dispatch(services, params, options);
-      const { text, secrets } = resolveSecretPlaceholders(params.text);
-      if (secrets.length === 0) return dispatch(services, params, options);
-      try {
-        const result = await dispatch(services, { ...params, text }, options);
-        return { ...result, typed: params.text };
-      } catch (err) {
-        throw redactSecretsFromError(err, secrets);
-      }
-    }
+    execute: dispatchByPlatform({
+      toolId: "keyboard",
+      capability: capability16,
+      ios: makeIosImpl3(registry2),
+      iosRemote: makeIosRemoteImpl(registry2),
+      android: makeAndroidImpl(registry2),
+      chromium: makeChromiumImpl(registry2),
+      vega: vegaImpl4
+    })
   };
 }
 
@@ -133273,26 +133145,17 @@ async function describeVega(_serial) {
 
 // ../tool-server/src/utils/ui-tree-match.ts
 init_zod();
-function hasVisibleText(text) {
-  return text.replace(/[\p{Cf}\p{Co}\p{Cc}]/gu, "").trim().length > 0;
-}
-var selectorFieldsSchema = external_exports.object({
-  text: external_exports.string().min(1).refine(hasVisibleText, {
-    message: "text must contain at least one visible character (icon-font/private-use and zero-width characters render as nothing) \u2014 select by identifier or role instead"
-  }).optional().describe("Case-insensitive substring of the element's visible label or value."),
+var selectorSchema = external_exports.object({
+  text: external_exports.string().min(1).optional().describe("Case-insensitive substring of the element's visible label or value."),
   identifier: external_exports.string().min(1).optional().describe(
     "The element's identifier (accessibilityIdentifier / resource-id / testid), matched case-insensitively as the exact identifier or the unqualified resource-id name ('submit' matches 'com.example.app:id/submit')."
   ),
   role: external_exports.string().min(1).optional().describe(
     "Case-insensitive substring of the element's role (e.g. AXButton, button, TextView)."
   )
-}).strict();
-var selectorSchema = selectorFieldsSchema.refine(
-  (s) => Boolean(s.text || s.identifier || s.role),
-  {
-    message: "selector needs at least one of text, identifier, or role"
-  }
-);
+}).refine((s) => Boolean(s.text || s.identifier || s.role), {
+  message: "selector needs at least one of text, identifier, or role"
+});
 function nodeText(node) {
   return [node.label, node.value].filter(Boolean).join(" ");
 }
@@ -133309,32 +133172,15 @@ function identifierMatches(actual, needle) {
   if (!actual) return false;
   return equalsCI(actual, needle) || actual.toLowerCase().endsWith(`:id/${needle.toLowerCase()}`);
 }
-var uiTreeMatchInternals = {
-  createRegExp(pattern) {
-    return new RegExp(pattern);
-  }
-};
-function regexMatchesNonEmpty(regex, actual) {
-  if (!actual) return false;
-  return regex.test(actual);
-}
 function textMatches(actual, expected, mode) {
-  if (mode === "matches") {
-    return regexMatchesNonEmpty(uiTreeMatchInternals.createRegExp(expected), actual);
-  }
   return mode === "equals" ? equalsCI(actual, expected) : includesCI(actual, expected);
 }
-function matchNodeWithRegex(node, selector, textRegex) {
+function matchNode(node, selector) {
   if (selector.text !== void 0) {
     if (!includesCI(node.label, selector.text) && !includesCI(node.value, selector.text)) {
       return false;
     }
   }
-  if (textRegex !== void 0) {
-    if (!regexMatchesNonEmpty(textRegex, node.label) && !regexMatchesNonEmpty(textRegex, node.value)) {
-      return false;
-    }
-  }
   if (selector.identifier !== void 0 && !identifierMatches(node.identifier, selector.identifier)) {
     return false;
   }
@@ -133343,17 +133189,13 @@ function matchNodeWithRegex(node, selector, textRegex) {
   }
   return true;
 }
-function selectorTextRegex(selector) {
-  return selector.textMatches === void 0 ? void 0 : uiTreeMatchInternals.createRegExp(selector.textMatches);
-}
-function collectMatches(node, selector, textRegex, acc) {
-  if (matchNodeWithRegex(node, selector, textRegex)) acc.push(node);
-  for (const child of node.children) collectMatches(child, selector, textRegex, acc);
+function collectMatches(node, selector, acc) {
+  if (matchNode(node, selector)) acc.push(node);
+  for (const child of node.children) collectMatches(child, selector, acc);
 }
 function findAll(root2, selector) {
   const acc = [];
-  const textRegex = selectorTextRegex(selector);
-  for (const child of root2.children) collectMatches(child, selector, textRegex, acc);
+  for (const child of root2.children) collectMatches(child, selector, acc);
   return acc;
 }
 function isVisible(node) {
@@ -133417,29 +133259,21 @@ function nodeAtPoint(root2, point) {
   for (const child of root2.children) walk(child);
   return best;
 }
-function fullConsumptionRegex(selector) {
-  return selector.textMatches === void 0 ? void 0 : uiTreeMatchInternals.createRegExp(`^(?:${selector.textMatches})$`);
-}
-function exactFieldCount(node, selector, fullTextRegex) {
+function exactFieldCount(node, selector) {
   let count = 0;
   if (selector.text !== void 0 && (equalsCI(node.label, selector.text) || equalsCI(node.value, selector.text))) {
     count++;
   }
-  if (fullTextRegex !== void 0 && (regexMatchesNonEmpty(fullTextRegex, node.label) || regexMatchesNonEmpty(fullTextRegex, node.value))) {
-    count++;
-  }
   if (selector.identifier !== void 0 && equalsCI(node.identifier, selector.identifier)) count++;
   if (selector.role !== void 0 && equalsCI(node.role, selector.role)) count++;
   return count;
 }
 function selectorToFrame(root2, selector) {
   const visible = findAll(root2, selector).filter(isVisible);
-  if (visible.length === 0) return void 0;
-  const fullTextRegex = fullConsumptionRegex(selector);
   let best;
   let bestExact = -1;
   for (const n of visible) {
-    const exact = exactFieldCount(n, selector, fullTextRegex);
+    const exact = exactFieldCount(n, selector);
     if (best === void 0 || exact !== bestExact) {
       if (exact > bestExact) {
         best = n;
@@ -133467,7 +133301,7 @@ var GENERIC_ROLES = /* @__PURE__ */ new Set([
 ]);
 function deriveSelector(node) {
   if (node.identifier && node.identifier.trim()) return { identifier: node.identifier };
-  const text = [node.label, node.value].map((t) => t?.trim()).find((t) => t && hasVisibleText(t));
+  const text = [node.label, node.value].map((t) => t?.trim()).find(Boolean);
   if (text) return { text };
   if (node.role && !GENERIC_ROLES.has(node.role.toLowerCase())) return { role: node.role };
   return null;
@@ -133723,7 +133557,7 @@ a prior tap), use individual tool calls instead.
 
 Allowed tools and their args (udid is auto-injected, do NOT include it in args):
 
-  gesture-tap:    { x: number, y: number, clickCount?: number }                                                        [ios/android/chromium]
+  gesture-tap:    { x: number, y: number }                                                                              [ios/android/chromium]
   gesture-swipe:  { fromX: number, fromY: number, toX: number, toY: number, durationMs?: number }                       [ios/android]
   gesture-scroll: { x: number, y: number, deltaX?: number, deltaY?: number, durationMs?: number }                       [chromium only]
   gesture-drag:   { fromX: number, fromY: number, toX: number, toY: number, durationMs?: number }                       [chromium only]
@@ -133731,8 +133565,7 @@ Allowed tools and their args (udid is auto-injected, do NOT include it in args):
   gesture-pinch:  { centerX: number, centerY: number, startDistance: number, endDistance: number, angle?: number, durationMs?: number }              [ios only]
   gesture-rotate: { centerX: number, centerY: number, radius: number, startAngle: number, endAngle: number, durationMs?: number }                    [ios only]
   button:         { button: "home"|"back"|"power"|"volumeUp"|"volumeDown"|"appSwitch"|"actionButton" }                  [ios/android]
-  keyboard:       { text?: string, key?: string, delayMs?: number }  (key pressed after text; TV: text only)            [ios/android/chromium/vega/tv]
-                  text supports {{secret:<NAME>}} placeholders, resolved server-side from ARGENT_SECRET_<NAME> env vars (prefix mandatory) \u2014 credentials never enter agent context
+  keyboard:       { text?: string, key?: string, delayMs?: number }  (TV: text only)                                    [ios/android/chromium/vega/tv]
   rotate:         { orientation: "Portrait"|"LandscapeLeft"|"LandscapeRight"|"PortraitUpsideDown" }                     [ios/android]
   tv-remote:      { button: <remote button | array of them>, repeat?: number }                                          [apple tv/android tv/vega]
                   buttons: up/down/left/right/select/back/home/menu/playPause (+ rewind/fastForward/next/previous/volumeUp/volumeDown/mute \u2014 work on Android TV and Vega; rejected on the Apple TV simulator)
@@ -133745,9 +133578,10 @@ Example \u2014 scroll down three times (use gesture-scroll with positive deltaY
     { "tool": "gesture-swipe", "args": { "fromX": 0.5, "fromY": 0.7, "toX": 0.5, "toY": 0.3 } }
   ]}
 
-Example \u2014 type text and submit (one step: the key is pressed after the text is typed):
+Example \u2014 type text and submit:
   { "udid": "<UDID>", "steps": [
-    { "tool": "keyboard", "args": { "text": "hello world", "key": "enter" } }
+    { "tool": "keyboard", "args": { "text": "hello world" } },
+    { "tool": "keyboard", "args": { "key": "enter" } }
   ]}
 
 Example \u2014 TV: move focus right twice then activate (one tv-remote step with a path is cheaper):
@@ -133845,8 +133679,7 @@ var DEBUGGER_TOOL_CAPABILITY = {
   apple: { simulator: true, device: true },
   appleRemote: { simulator: true },
   android: { emulator: true, device: true, unknown: true },
-  chromium: { app: true },
-  vega: { vvd: true }
+  chromium: { app: true }
 };
 var RN_ONLY_TOOL_CAPABILITY = {
   apple: { simulator: true, device: true },
@@ -133865,14 +133698,14 @@ function debuggerServiceRef(params) {
 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: iOS simulator UDID, Android logicalDeviceId returned by Metro, or Chromium device id (chromium-cdp-<port>) from list-devices. The returned logicalDeviceId must be forwarded as device_id to all subsequent debugger-* calls to pin them to this device."
   )
 });
 var debuggerConnectTool = {
   id: "debugger-connect",
   description: `Connect to a JS runtime CDP debugger.
-iOS / Android / Vega: connects to Metro's CDP endpoint on the given port. Chromium: re-uses the page CDP session opened by boot-device \u2014 port is ignored.
-Returns connection info including port, projectRoot (empty on Chromium and on legacy Metro, e.g. Vega), deviceName, appName, logicalDeviceId (absent on Vega), and isNewDebugger. If already connected, returns the existing connection.
+iOS / Android: connects to Metro's CDP endpoint on the given port. Chromium: re-uses the page CDP session opened by boot-device \u2014 port is ignored.
+Returns connection info including port, projectRoot (empty on Chromium), deviceName, appName, logicalDeviceId, and isNewDebugger. If already connected, returns the existing connection.
 Use when starting a debug session or before calling other debugger-* tools. Fails if the runtime is unreachable (Metro down, or Chromium CDP terminated).`,
   zodSchema: zodSchema29,
   capability: DEBUGGER_TOOL_CAPABILITY,
@@ -133898,13 +133731,13 @@ 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 debugger-connect (iOS simulator UDID, Android logicalDeviceId, or Chromium device id)."
   )
 });
 var debuggerStatusTool = {
   id: "debugger-status",
   description: `Get JS runtime debugger connection status and diagnostic info.
-Use when you need to verify connectivity before using other debugger tools. Returns port, projectRoot (empty on Chromium and on legacy Metro, e.g. Vega), deviceName, appName, logicalDeviceId (absent on Vega), isNewDebugger (false on the legacy inspector), connected flag, loadedScripts count, and sourceMapReady (always true \u2014 waits for pending source maps before returning; no-op on Chromium). Fails if the runtime is unreachable.`,
+Use when you need to verify connectivity before using other debugger tools. Returns port, projectRoot (empty on Chromium), deviceName, appName, logicalDeviceId, connected flag, loadedScripts count, and sourceMapReady (always true \u2014 waits for pending source maps before returning; no-op on Chromium). Fails if the runtime is unreachable.`,
   zodSchema: zodSchema30,
   capability: DEBUGGER_TOOL_CAPABILITY,
   services: (params) => ({
@@ -133933,13 +133766,13 @@ 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 debugger-connect (iOS simulator UDID, Android logicalDeviceId, or Chromium device id)."
   ),
   expression: external_exports.string().describe("JavaScript expression to evaluate in the app runtime")
 });
 var debuggerEvaluateTool = {
   id: "debugger-evaluate",
-  description: `Execute arbitrary JavaScript in the app's JS runtime via CDP \u2014 Hermes on iOS / Android / Vega, V8 on Chromium.
+  description: `Execute arbitrary JavaScript in the app's JS runtime via CDP \u2014 Hermes on iOS / Android, V8 on Chromium.
 Returns the evaluation result as a JSON-serializable value, along with deviceName, appName, and logicalDeviceId for context. Use when you need to read app state, call app functions, or test logic at runtime. The result is serialized by value, so cyclic objects (many RN runtime values \u2014 fiber nodes, navigation refs, global \u2014 are cyclic) fail with a serialization error rather than returning silently. Fails if the expression throws or the runtime is not connected.`,
   zodSchema: zodSchema31,
   capability: DEBUGGER_TOOL_CAPABILITY,
@@ -135423,13 +135256,13 @@ 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 debugger-connect (iOS simulator UDID, Android logicalDeviceId, or Chromium device id)."
   )
 });
 var debuggerLogRegistryTool = {
   id: "debugger-log-registry",
   description: `Get a summary of all console logs captured from the app's JS runtime.
-Returns the log file path, entry counts by level, and message clusters (grouped by similarity). Works against Hermes (iOS / Android / Vega) and V8 (Chromium).
+Returns the log file path, entry counts by level, and message clusters (grouped by similarity). Works against Hermes (iOS / Android) and V8 (Chromium).
 Use when investigating warnings, errors, or unexpected output \u2014 call this first for an overview, then read the returned file for details. Returns empty stats if no log data has been captured yet.`,
   zodSchema: zodSchema35,
   capability: DEBUGGER_TOOL_CAPABILITY,
@@ -135521,7 +135354,7 @@ var networkLogsTool = {
   description: `Retrieve captured network (HTTP) requests from the running app.
 Returns a paginated list of requests with method, URL, status, resource type, size, and duration.
 Each entry includes a requestId that can be passed to view-network-request-details for full details.
-On React Native (iOS / Android / Vega) interception is injected into the JS runtime \u2014 it captures fetch() calls. On Chromium it reads the browser's native CDP Network domain (the active tab; all request types).
+On React Native (iOS/Android) interception is injected into the JS runtime \u2014 it captures fetch() calls. On Chromium it reads the browser's native CDP Network domain (the active tab; all request types).
 Use when inspecting outbound HTTP traffic or debugging API calls in the running app.
 Fails if the app is not connected (RN) or the device is not reachable (Chromium).`,
   zodSchema: zodSchema36,
@@ -144664,67 +144497,14 @@ function chromiumLaunchSpec(launch) {
   return typeof c === "string" ? { path: c } : { path: c.path, args: c.args };
 }
 function selectorToYaml(sel) {
-  if (sel.text !== void 0 && sel.textMatches !== void 0) {
-    throw new Error(
-      'Cannot serialize flow selector without losing constraints: both `text` and `textMatches` are set, but flow YAML can represent only one `text` constraint (a literal string or `{ matches: "<regex>" }`). Use either literal or regex text matching.'
-    );
-  }
-  if (sel.text !== void 0 && (typeof sel.text !== "string" || !hasVisibleText(sel.text))) {
-    throw new Error(
-      "Cannot serialize flow selector: `text` must contain at least one visible character (icon-font/private-use and zero-width characters render as nothing). Select by identifier or role, or use a coordinate tap."
-    );
-  }
-  if (sel.loose && (sel.text === void 0 || sel.textMatches !== void 0 || sel.identifier !== void 0 || sel.role !== void 0)) {
-    const incompatible = [
-      sel.textMatches !== void 0 ? "textMatches" : void 0,
-      sel.identifier !== void 0 ? "identifier" : void 0,
-      sel.role !== void 0 ? "role" : void 0
-    ].filter((field) => field !== void 0);
-    throw new Error(
-      "Cannot serialize loose flow selector without changing its meaning: bare-string YAML can represent only a loose text-only selector" + (incompatible.length > 0 ? `; incompatible fields: ${incompatible.join(", ")}` : "") + "."
-    );
-  }
   if (sel.loose && sel.text !== void 0 && sel.identifier === void 0 && sel.role === void 0) {
     return sel.text;
   }
-  const { loose: _loose, identifier, textMatches: textMatches2, ...rest } = sel;
-  const out = { ...rest };
-  if (textMatches2 !== void 0) out.text = { matches: textMatches2 };
-  if (identifier !== void 0) out.id = identifier;
-  return out;
+  const { loose: _loose, identifier, ...rest } = sel;
+  return identifier === void 0 ? { ...rest } : { ...rest, id: identifier };
 }
 function describeSelector(s) {
-  return Object.entries(s).filter(([k]) => k !== "loose").map(
-    ([k, v]) => k === "textMatches" ? `text=/${v}/` : `${k === "identifier" ? "id" : k}="${v}"`
-  ).join(" ");
-}
-function describeTextExpectation(expectedText, textMatch, verbForm = "mode") {
-  const expected = expectedText ?? "";
-  const mode = textMatch ?? "contains";
-  switch (mode) {
-    case "contains":
-      return `${verbForm === "infinitive" ? "contain" : mode} ${JSON.stringify(expected)}`;
-    case "equals":
-      return `${verbForm === "infinitive" ? "equal" : mode} ${JSON.stringify(expected)}`;
-    case "matches":
-      return `${verbForm === "infinitive" ? "match" : mode} /${expected}/`;
-  }
-}
-function textWaitToYaml(selector, expectedText, textMatch) {
-  const expected = expectedText ?? "";
-  const mode = textMatch ?? "contains";
-  switch (mode) {
-    case "contains":
-      return { text: { in: selector, contains: expected } };
-    case "equals":
-      return { text: { in: selector, equals: expected } };
-    case "matches":
-      return { text: { in: selector, matches: expected } };
-    default: {
-      const exhaustive = mode;
-      throw new Error(`Unsupported text match mode: ${exhaustive}`);
-    }
-  }
+  return Object.entries(s).filter(([k]) => k !== "loose").map(([k, v]) => `${k === "identifier" ? "id" : k}="${v}"`).join(" ");
 }
 function waitToYaml(condition, selector, expectedText, textMatch, timeoutMs) {
   const sel = selectorToYaml(selector);
@@ -144740,7 +144520,7 @@ function waitToYaml(condition, selector, expectedText, textMatch, timeoutMs) {
       body = { hidden: sel };
       break;
     case "text":
-      body = textWaitToYaml(sel, expectedText, textMatch);
+      body = textMatch === "equals" ? { text: { in: sel, equals: expectedText ?? "" } } : { text: { in: sel, contains: expectedText ?? "" } };
       break;
   }
   if (timeoutMs !== void 0) body.timeout = timeoutMs;
@@ -144755,20 +144535,9 @@ function toYamlStep(step) {
     case "run":
       return { run: step.flow };
     case "tap": {
-      if (step.selector) {
-        const sel = selectorToYaml(step.selector);
-        return { tap: step.times !== void 0 ? { on: sel, times: step.times } : sel };
-      }
-      const body = { x: step.x, y: step.y };
-      if (step.times !== void 0) body.times = step.times;
+      const body = step.selector ? selectorToYaml(step.selector) : { x: step.x, y: step.y };
       return { tap: body };
     }
-    case "long-press": {
-      const sel = selectorToYaml(step.selector);
-      return {
-        "long-press": step.duration !== void 0 ? { on: sel, duration: step.duration } : sel
-      };
-    }
     case "type": {
       const body = {
         into: selectorToYaml(step.into),
@@ -144833,16 +144602,6 @@ function badEntry(raw, detail) {
     error_kind: "validation"
   });
 }
-function validatePattern(raw, pattern, where) {
-  try {
-    new RegExp(pattern);
-  } catch (err) {
-    badEntry(
-      raw,
-      `${where} \`matches\` is not a valid regular expression: ${err instanceof Error ? err.message : String(err)}`
-    );
-  }
-}
 function editDistance(a, b) {
   let prevPrev = new Array(b.length + 1);
   let prev = Array.from({ length: b.length + 1 }, (_, i) => i);
@@ -144906,46 +144665,11 @@ function parseSelector(raw, where) {
     }
     normalized = { ...rest, identifier: id };
   }
-  if (normalized !== null && typeof normalized === "object") {
-    const { text, ...rest } = normalized;
-    if (text !== null && typeof text === "object") {
-      const keys = Object.keys(text);
-      if (!Array.isArray(text)) {
-        rejectUnknownKeys(
-          raw,
-          text,
-          ["matches"],
-          `${where}: text matcher`
-        );
-      }
-      const pattern = text.matches;
-      if (keys.length !== 1 || keys[0] !== "matches") {
-        badEntry(
-          raw,
-          `${where}: a text matcher takes exactly { matches: '<regex>' } \u2014 for a substring, use the plain-string form (text: "\u2026")`
-        );
-      }
-      if (typeof pattern !== "string" || pattern.length === 0) {
-        badEntry(raw, `${where}: text matcher needs a non-empty \`matches\` pattern`);
-      }
-      validatePattern(raw, pattern, `${where}: text`);
-      const fields = selectorFieldsSchema.safeParse(rest);
-      if (!fields.success) {
-        badEntry(raw, `${where}: ${fields.error.issues[0]?.message ?? "invalid selector"}`);
-      }
-      return { ...fields.data, textMatches: pattern };
-    }
-  }
   const r = selectorSchema.safeParse(normalized);
   if (!r.success) badEntry(raw, `${where}: ${r.error.issues[0]?.message ?? "invalid selector"}`);
   return r.data;
 }
 var WAIT_CONDITIONS = ["exists", "visible", "hidden", "text"];
-var TEXT_MATCH_MODES = Object.keys({
-  contains: true,
-  equals: true,
-  matches: true
-});
 var SCROLL_DIRECTIONS = ["up", "down", "left", "right"];
 function parseWaitFields(raw, kind) {
   if (raw === null || typeof raw !== "object") {
@@ -144985,30 +144709,22 @@ function parseWaitFields(raw, kind) {
   if (condition === "text") {
     const t = b.text;
     if (t === null || typeof t !== "object") {
-      badEntry(
-        { [kind]: b },
-        `${kind} text needs { in: <selector>, contains|equals|matches: <string> }`
-      );
+      badEntry({ [kind]: b }, `${kind} text needs { in: <selector>, contains|equals: <string> }`);
     }
     const tb = t;
     if (!Array.isArray(tb)) {
-      rejectUnknownKeys({ [kind]: b }, tb, ["in", ...TEXT_MATCH_MODES], `${kind}.text`);
+      rejectUnknownKeys({ [kind]: b }, tb, ["in", "contains", "equals"], `${kind}.text`);
     }
-    const comparators = TEXT_MATCH_MODES.filter((mode) => mode in tb);
-    if (comparators.length !== 1) {
-      badEntry(
-        { [kind]: b },
-        `${kind} text needs exactly one of \`contains\`, \`equals\`, or \`matches\``
-      );
+    const hasContains = "contains" in tb;
+    const hasEquals = "equals" in tb;
+    if (hasContains === hasEquals) {
+      badEntry({ [kind]: b }, `${kind} text needs exactly one of \`contains\` or \`equals\``);
     }
-    const textMatch = comparators[0];
-    const expected = tb[textMatch];
+    const textMatch = hasEquals ? "equals" : "contains";
+    const expected = hasEquals ? tb.equals : tb.contains;
     if (typeof expected !== "string" || expected.length === 0) {
       badEntry({ [kind]: b }, `${kind} text needs a non-empty \`${textMatch}\``);
     }
-    if (textMatch === "matches") {
-      validatePattern({ [kind]: b }, expected, `${kind} text`);
-    }
     return {
       condition: "text",
       selector: parseSelector(tb.in, `${kind}.text.in`),
@@ -145071,7 +144787,6 @@ var STEP_DIRECTIVE_KEYS = [
   "run",
   "tool",
   "tap",
-  "long-press",
   "type",
   "await",
   "assert",
@@ -145079,79 +144794,6 @@ var STEP_DIRECTIVE_KEYS = [
   "scroll-to",
   "snapshot"
 ];
-function parseLongPress(body, entry) {
-  const obj = body !== null && typeof body === "object" ? body : {};
-  if (obj.on !== void 0 || obj.duration !== void 0) {
-    if (obj.text !== void 0 || obj.id !== void 0 || obj.identifier !== void 0 || obj.role !== void 0) {
-      badEntry(
-        entry,
-        'the long-press options form takes a nested selector \u2014 e.g. long-press: { on: { text: "Row" }, duration: 1200 }'
-      );
-    }
-    if (!Object.keys(obj).every((k) => k === "on" || k === "duration")) {
-      badEntry(entry, "the long-press options form accepts only { on, duration }");
-    }
-    if (obj.on === void 0) {
-      badEntry(entry, 'long-press needs a target \u2014 e.g. long-press: { on: "Row", duration: 1200 }');
-    }
-    const step = { kind: "long-press", selector: parseSelector(obj.on, "long-press.on") };
-    if (obj.duration !== void 0) {
-      if (typeof obj.duration !== "number" || !Number.isFinite(obj.duration) || obj.duration <= 0) {
-        badEntry(
-          entry,
-          "long-press.duration needs a positive number of milliseconds (e.g. `duration: 1200`)"
-        );
-      }
-      step.duration = obj.duration;
-    }
-    return step;
-  }
-  return { kind: "long-press", selector: parseSelector(body, "long-press") };
-}
-function parseTapTimes(raw, entry) {
-  if (raw === void 0) return void 0;
-  if (typeof raw !== "number" || !Number.isInteger(raw) || raw < 1 || raw > 10) {
-    badEntry(entry, "tap.times must be an integer between 1 and 10 (2 = double-tap)");
-  }
-  return raw === 1 ? void 0 : raw;
-}
-function parseTap(body, entry) {
-  const obj = body !== null && typeof body === "object" ? body : {};
-  if (obj.x !== void 0 || obj.y !== void 0) {
-    if (obj.on !== void 0 || obj.text !== void 0 || obj.id !== void 0 || obj.identifier !== void 0 || obj.role !== void 0) {
-      badEntry(entry, "tap takes a selector or x/y coordinates, not both");
-    }
-    if (typeof obj.x !== "number" || typeof obj.y !== "number") {
-      badEntry(entry, "a coordinate tap needs numeric x and y");
-    }
-    if (!Object.keys(obj).every((k) => k === "x" || k === "y" || k === "times")) {
-      badEntry(entry, "a coordinate tap takes only { x, y, times }");
-    }
-    const step = { kind: "tap", x: obj.x, y: obj.y };
-    const times = parseTapTimes(obj.times, entry);
-    if (times !== void 0) step.times = times;
-    return step;
-  }
-  if (obj.on !== void 0 || obj.times !== void 0) {
-    if (obj.text !== void 0 || obj.id !== void 0 || obj.identifier !== void 0 || obj.role !== void 0) {
-      badEntry(
-        entry,
-        'the tap options form takes a nested selector \u2014 e.g. tap: { on: { text: "Photo" }, times: 2 }'
-      );
-    }
-    if (!Object.keys(obj).every((k) => k === "on" || k === "times")) {
-      badEntry(entry, "the tap options form accepts only { on, times }");
-    }
-    if (obj.on === void 0) {
-      badEntry(entry, 'tap with times needs a target \u2014 e.g. tap: { on: "Photo", times: 2 }');
-    }
-    const step = { kind: "tap", selector: parseSelector(obj.on, "tap.on") };
-    const times = parseTapTimes(obj.times, entry);
-    if (times !== void 0) step.times = times;
-    return step;
-  }
-  return { kind: "tap", selector: parseSelector(body, "tap") };
-}
 function fromYamlStep(raw) {
   const entry = raw;
   const kinds = STEP_DIRECTIVE_KEYS.filter((k) => k in entry);
@@ -145177,9 +144819,22 @@ function fromYamlStep(raw) {
   if ("echo" in raw) return { kind: "echo", message: String(raw.echo) };
   if ("launch" in raw) return { kind: "launch", app: parseLaunch(raw.launch) };
   if ("run" in raw) return { kind: "run", flow: String(raw.run) };
-  if ("tap" in raw) return parseTap(raw.tap, raw);
-  if ("long-press" in raw) {
-    return parseLongPress(raw["long-press"], raw);
+  if ("tap" in raw) {
+    const body = raw.tap;
+    const obj = body !== null && typeof body === "object" ? body : {};
+    if (body !== null && typeof body === "object" && !Array.isArray(body)) {
+      rejectUnknownKeys(raw, obj, [...SELECTOR_KEYS, "x", "y"], "tap");
+    }
+    if (obj.x !== void 0 || obj.y !== void 0) {
+      if (obj.text !== void 0 || obj.id !== void 0 || obj.identifier !== void 0 || obj.role !== void 0) {
+        badEntry(raw, "tap takes a selector or x/y coordinates, not both");
+      }
+      if (typeof obj.x !== "number" || typeof obj.y !== "number") {
+        badEntry(raw, "a coordinate tap needs numeric x and y");
+      }
+      return { kind: "tap", x: obj.x, y: obj.y };
+    }
+    return { kind: "tap", selector: parseSelector(body, "tap") };
   }
   if ("type" in raw) {
     const body = raw.type;
@@ -146016,15 +145671,13 @@ If a step was recorded by mistake, edit the .yaml file directly to remove it.`,
       const runTarget = params.command === RUN_TARGET_COMMAND && params.delayMs === void 0 ? await captureRunTarget(session, args) : void 0;
       const strippedArgs = stripDeviceKeys(args);
       const isLaunch = params.command === "restart-app" && params.delayMs === void 0 && typeof strippedArgs.bundleId === "string" && Object.keys(strippedArgs).length === 1;
-      const cc = args.clickCount;
-      const tapTimes = isTap && typeof cc === "number" && Number.isInteger(cc) && cc >= 2 && cc <= 10 ? { times: cc } : {};
       let step;
       let warning;
       if (captured?.selector) {
-        step = { kind: "tap", selector: captured.selector, ...tapTimes };
+        step = { kind: "tap", selector: captured.selector };
         warning = captured.warning;
       } else if (isTap) {
-        step = { kind: "tap", x: args.x, y: args.y, ...tapTimes };
+        step = { kind: "tap", x: args.x, y: args.y };
         warning = captured?.warning;
       } else if (isLaunch) {
         step = { kind: "launch", app: strippedArgs.bundleId };
@@ -146114,20 +145767,11 @@ You can still edit the .yaml file directly afterwards to remove or reorder steps
           return `${n}. run: ${step.flow}`;
         case "tap":
           return `${n}. tap: ${step.selector ? selectorLabel(step.selector) : `(${step.x}, ${step.y})`}`;
-        case "long-press":
-          return `${n}. long-press: ${selectorLabel(step.selector)}`;
         case "type":
           return `${n}. type: ${selectorLabel(step.into)} \u2190 "${step.text}"`;
         case "await":
         case "assert": {
-          let tail;
-          if (step.condition !== "text") {
-            tail = `${step.condition} ${selectorLabel(step.selector)}`;
-          } else {
-            const selector = selectorLabel(step.selector);
-            const expected = step.expectedText ?? "";
-            tail = step.textMatch === "matches" ? `text ${selector} matches /${expected}/` : step.textMatch === "equals" ? `text ${selector} == ${JSON.stringify(expected)}` : `text ${selector} contains ${JSON.stringify(expected)}`;
-          }
+          const tail = step.condition === "text" ? `text ${selectorLabel(step.selector)} == "${step.expectedText ?? ""}"` : `${step.condition} ${selectorLabel(step.selector)}`;
           return `${n}. ${step.kind}: ${tail}`;
         }
         case "wait":
@@ -146369,7 +146013,7 @@ function offscreenHint(sel) {
   return `no visible element matched selector ${describeSelector(sel)} \u2014 if it is off-screen, add a scroll-to step before this one`;
 }
 async function runDirective(env, step) {
-  if (env.device.platform === "vega" && (step.kind === "tap" || step.kind === "long-press" || step.kind === "type" || step.kind === "scroll-to")) {
+  if (env.device.platform === "vega" && (step.kind === "tap" || step.kind === "type" || step.kind === "scroll-to")) {
     return {
       ok: false,
       reason: `${step.kind} is a touch directive and Vega is remote-driven \u2014 move focus with \`tool: tv-remote\` steps (and type via \`tool: keyboard\`) instead`
@@ -146378,8 +146022,6 @@ async function runDirective(env, step) {
   switch (step.kind) {
     case "tap":
       return runTap(env, step);
-    case "long-press":
-      return runLongPress(env, step);
     case "type":
       return runType(env, step);
     case "await":
@@ -146407,37 +146049,7 @@ async function runTap(env, target) {
   } else {
     return { ok: false, reason: "tap needs a selector or x/y coordinates" };
   }
-  await invokeOnDevice(env, "gesture-tap", {
-    ...point,
-    ...target.times !== void 0 ? { clickCount: target.times } : {}
-  });
-  return { ok: true };
-}
-var DEFAULT_LONG_PRESS_MS = 800;
-async function runLongPress(env, step) {
-  const frame = await waitForFrame(env, step.selector);
-  if (frame === "aborted") return ABORTED_OUTCOME;
-  if (!frame) {
-    return { ok: false, reason: offscreenHint(step.selector) };
-  }
-  const point = getDescribeTapPoint(frame);
-  const duration3 = step.duration ?? DEFAULT_LONG_PRESS_MS;
-  if (env.device.platform === "chromium") {
-    await invokeOnDevice(env, "gesture-drag", {
-      fromX: point.x,
-      fromY: point.y,
-      toX: point.x,
-      toY: point.y,
-      durationMs: duration3
-    });
-  } else {
-    await invokeOnDevice(env, "gesture-custom", {
-      events: [
-        { type: "Down", x: point.x, y: point.y, delayMs: 0 },
-        { type: "Up", x: point.x, y: point.y, delayMs: duration3 }
-      ]
-    });
-  }
+  await invokeOnDevice(env, "gesture-tap", point);
   return { ok: true };
 }
 async function runType(env, step) {
@@ -146521,11 +146133,11 @@ function assertReason(condition, selector, expectedText, textMatch, matches2) {
     case "text": {
       const first = firstInReadingOrder(matches2.filter(isVisible)) ?? firstInReadingOrder(matches2);
       if (!first) return `no element matched selector ${sel}`;
-      const wanted = describeTextExpectation(expectedText, textMatch, "infinitive");
+      const wanted = textMatch === "equals" ? "equal" : "contain";
       const shown = assertText(first);
       const own = nodeText(first);
       const ownNote = own && own !== shown ? ` (own text "${own}")` : "";
-      return `element matched ${sel} but its text was "${shown}"${ownNote} (wanted to ${wanted})`;
+      return `element matched ${sel} but its text was "${shown}"${ownNote} (wanted to ${wanted} "${expectedText}")`;
     }
     default:
       return `assertion failed for selector ${sel}`;
@@ -148874,9 +148486,8 @@ function createRunFlowTool(registry2) {
     id: "flow-execute",
     description: `Run a saved flow from the .argent/flows/ directory.
 Steps run in order: \`launch\` starts an app from scratch (terminate + relaunch) and waits until it is
-ready; \`tool\` calls dispatch through the registry; \`tap\`/\`long-press\`/\`type\` resolve a selector to an
-element and act on it (\`long-press: { on, duration }\` presses and holds); \`scroll-to\` scrolls
-(momentum-free) until a target is visible; \`await\` waits for a UI
+ready; \`tool\` calls dispatch through the registry; \`tap\`/\`type\` resolve a selector to an element and
+act on it; \`scroll-to\` scrolls (momentum-free) until a target is visible; \`await\` waits for a UI
 condition; \`wait\` pauses for a fixed number of milliseconds; \`assert\` checks one now; \`snapshot\`
 diffs a screenshot against a stored baseline (a missing baseline fails the step \u2014 set updateBaselines
 to adopt the current screen); \`echo\` annotates; \`run\` executes a referenced fragment inline.
@@ -149021,7 +148632,6 @@ function pushReport(state3, report) {
 function selectorLabel2(sel) {
   const parts = [];
   if (sel.text !== void 0) parts.push(`"${sel.text}"`);
-  if (sel.textMatches !== void 0) parts.push(`/${sel.textMatches}/`);
   if (sel.identifier) parts.push(`id=${sel.identifier}`);
   if (sel.role) parts.push(`role=${sel.role}`);
   return parts.join(" ");
@@ -149032,15 +148642,13 @@ function stepTarget(step) {
       if (step.selector) return selectorLabel2(step.selector);
       if (step.x !== void 0 && step.y !== void 0) return `(${step.x}, ${step.y})`;
       return void 0;
-    case "long-press":
-      return selectorLabel2(step.selector);
     case "type":
       return `into ${selectorLabel2(step.into)}`;
     case "await":
     case "assert": {
       const sel = selectorLabel2(step.selector);
       if (step.condition === "text") {
-        return `${sel} ${describeTextExpectation(step.expectedText, step.textMatch)}`;
+        return `${sel} ${step.textMatch ?? "contains"} "${step.expectedText ?? ""}"`;
       }
       return `${step.condition} ${sel}`;
     }
@@ -149129,7 +148737,6 @@ async function execLeafStep(state3, step, index, sourceFlow) {
       return { ...base, status: r.ok ? "pass" : "error", reason: r.reason };
     }
     case "tap":
-    case "long-press":
     case "type":
     case "await":
     case "assert":
@@ -149941,7 +149548,7 @@ function normLabel(s) {
   return (s || "").toLowerCase().replace(/-/g, "").replace(/[\s,]+/g, " ").trim();
 }
 var MAX_FRAME_AREA = 0.85;
-function matchNode(n, match, needle) {
+function matchNode2(n, match, needle) {
   const label = normLabel(n.label);
   const ident = normLabel(n.identifier);
   const value = normLabel(n.value);
@@ -149968,7 +149575,7 @@ function findElementMatch(tree, match) {
   const candidates = [];
   const walk = (n) => {
     if (!n || typeof n !== "object") return;
-    const m = matchNode(n, match, needle);
+    const m = matchNode2(n, match, needle);
     if (m && n.frame) {
       const f = n.frame;
       const cx = f.x + f.width / 2;