@avasapp/agent-bridge 0.4.1 → 0.5.0

package/dist/runtime/index.cjs

@@ -515,7 +515,12 @@ var SWITCH_HOSTS = /* @__PURE__ */ new Set(["RCTSwitch", "AndroidSwitch"]);
 var isFn = (v) => typeof v === "function";
 var isInputProps = (p) => isFn(p.onChangeText) || isFn(p.onChange) && typeof p.value !== "boolean" && ("value" in p || "defaultValue" in p || "placeholder" in p);
 var labelOf = (p) => p.accessibilityLabel ?? p["aria-label"];
-var interesting = (p) => isFn(p.onPress) || isFn(p.onValueChange) || isInputProps(p) || typeof p.testID === "string" || typeof labelOf(p) === "string" || webViewNameOf(p) !== void 0;
+function actionNamesOf(p) {
+  if (!isFn(p.onAccessibilityAction) || !Array.isArray(p.accessibilityActions)) return null;
+  return p.accessibilityActions.map((a) => a?.name).filter((name) => typeof name === "string");
+}
+var activates = (rec) => !!rec.actions && !!rec.element.actions?.includes("activate");
+var interesting = (p) => isFn(p.onPress) || actionNamesOf(p) !== null || isFn(p.onValueChange) || isInputProps(p) || typeof p.testID === "string" || typeof labelOf(p) === "string" || webViewNameOf(p) !== void 0;
 var ICON_GLYPHS = /[\uE000-\uF8FF]/g;
 function firstHost(fiber) {
   if (fiber.tag === HOST_COMPONENT) return fiber;
@@ -532,6 +537,11 @@ function absorb(rec, fiber, p) {
   const e = rec.element;
   if (!rec.input && isInputProps(p)) rec.input = fiber;
   if (!rec.press && isFn(p.onPress)) rec.press = fiber;
+  const actions = actionNamesOf(p);
+  if (!rec.actions && actions) {
+    rec.actions = fiber;
+    if (actions.length) e.actions = actions;
+  }
   const fill = (key, v) => {
     if (e[key] === void 0 && typeof v === "string") e[key] = v;
   };
@@ -617,8 +627,8 @@ var round = (r) => r && {
 var handles = (control, p, name) => !!control && isFn(p[name]) && propsOf(control)?.[name] === p[name];
 function sameControl(rec, p) {
   for (let r = rec; r; r = r.parent) {
-    if (!r.press && !r.input) continue;
-    const same = handles(r.press, p, "onPress") || handles(r.input, p, "onChangeText") || handles(r.input, p, "onChange");
+    if (!r.press && !r.input && !r.actions) continue;
+    const same = handles(r.press, p, "onPress") || handles(r.actions, p, "onAccessibilityAction") || handles(r.input, p, "onChangeText") || handles(r.input, p, "onChange");
     return same ? r : null;
   }
   return null;
@@ -648,6 +658,7 @@ function collectScreen(roots, window) {
       host,
       press: null,
       input: null,
+      actions: null,
       hidden,
       scroller,
       modal,
@@ -661,7 +672,7 @@ function collectScreen(roots, window) {
     return rec;
   };
   const buttonOf = (rec) => {
-    for (let r = rec; r; r = r.parent) if (r.press) return r;
+    for (let r = rec; r; r = r.parent) if (r.press || activates(r)) return r;
     return null;
   };
   const textHost = (host) => {
@@ -752,7 +763,7 @@ function collectScreen(roots, window) {
     rec.hidden || (rec.hidden = covers2(rec));
     const text = rec.parts.map((part) => part.text.replace(ICON_GLYPHS, "").replace(/\s+/g, " ").trim()).filter(Boolean).join(" ");
     if (text) e.text = text;
-    e.kind = e.webview !== void 0 ? "webview" : rec.input ? "input" : rec.press ? "button" : rec.parts.length ? "text" : "view";
+    e.kind = e.webview !== void 0 ? "webview" : rec.input ? "input" : rec.press || activates(rec) ? "button" : rec.parts.length ? "text" : "view";
     if (e.kind === "input" && e.editable === void 0) e.editable = true;
     const rect = measureHost(rec.host);
     e.rect = round(rect);
@@ -777,10 +788,21 @@ function collectScreen(roots, window) {
 }
 var focused = (found) => found.filter((f) => !f.hidden);
 function pressFiberOf(found) {
-  if (found.press) return found.press;
+  if (found.press) return { fiber: found.press, via: "onPress" };
+  if (activates(found)) return { fiber: found.actions, via: "accessibilityAction" };
+  for (let f = found.fiber.return; f; f = f.return) {
+    const p = propsOf(f);
+    if (!p) continue;
+    if (isFn(p.onPress)) return { fiber: f, via: "onPress" };
+    if (actionNamesOf(p)?.includes("activate")) return { fiber: f, via: "accessibilityAction" };
+  }
+  return null;
+}
+function actionFiberOf(found, name) {
+  if (found.actions && found.element.actions?.includes(name)) return found.actions;
   for (let f = found.fiber.return; f; f = f.return) {
     const p = propsOf(f);
-    if (p && isFn(p.onPress)) return f;
+    if (p && actionNamesOf(p)?.includes(name)) return f;
   }
   return null;
 }
@@ -824,7 +846,7 @@ function tiers(target) {
     (e) => fields(e) && !!e.text?.includes(text)
   ];
 }
-var labelOnly = ({ element: e, press, input }) => e.kind === "view" && !e.testID && !e.text && !e.placeholder && !press && !input;
+var labelOnly = ({ element: e, press, input, actions }) => e.kind === "view" && !e.testID && !e.text && !e.placeholder && !press && !input && !actions;
 function matchTarget(found, target) {
   checkTarget(target);
   for (const pool of [found.filter((f) => !labelOnly(f)), found.filter(labelOnly)]) {
@@ -942,13 +964,36 @@ function fillInput(found, text, options = {}) {
   return value;
 }
 var center = (rect) => rect ? { x: rect.x + rect.width / 2, y: rect.y + rect.height / 2 } : { x: 0, y: 0 };
+var disabledProps = (fiber) => {
+  const p = propsOf(fiber);
+  const state = p?.accessibilityState;
+  return p?.disabled === true || state?.disabled === true || p?.["aria-disabled"] === true;
+};
+function pressTargetOf(found, action) {
+  if (action === void 0) return pressFiberOf(found);
+  const fiber = actionFiberOf(found, action);
+  return fiber && { fiber, via: "accessibilityAction" };
+}
 function pressElement(found, options = {}) {
-  const fiber = pressFiberOf(found);
-  if (!fiber) throw new Error(`${describe(found.element)} has no onPress`);
-  if (!options.force && (found.element.disabled || propsOf(fiber)?.disabled === true))
+  const { action } = options;
+  const target = pressTargetOf(found, action);
+  if (!target) {
+    const names = found.element.actions ?? [];
+    const has = names.length ? `; it has ${names.map((a) => JSON.stringify(a)).join(", ")}` : "";
+    throw new Error(
+      action === void 0 ? `${describe(found.element)} has no onPress or "activate" accessibility action` : `${describe(found.element)} has no accessibility action ${JSON.stringify(action)}${has}`
+    );
+  }
+  const { fiber, via } = target;
+  if (!options.force && (found.element.disabled || disabledProps(fiber)))
     throw new Error(
       `${describe(found.element)} is disabled; pass {"force":true} as the last argument to press anyway`
     );
+  if (via === "accessibilityAction") {
+    const actionName = action ?? "activate";
+    handler(fiber, "onAccessibilityAction")?.(event({ actionName }));
+    return `accessibilityAction:${actionName}`;
+  }
   const { x, y } = center(found.element.rect);
   const e = () => event({
     locationX: found.element.rect ? found.element.rect.width / 2 : 0,
@@ -960,6 +1005,7 @@ function pressElement(found, options = {}) {
   handler(fiber, "onPressIn")?.(e());
   handler(fiber, "onPress")?.(e());
   handler(fiber, "onPressOut")?.(e());
+  return "onPress";
 }
 
 // src/runtime/screen/find-text.ts
@@ -1266,9 +1312,19 @@ var POLL_MS = 50;
 function nearMissNote(found, target) {
   const text = typeof target === "string" ? target : target.text;
   const near = text ? nearMisses(found, text) : [];
-  return near.length ? `. Near misses: ${near.join("; ")}` : "";
-}
-function waitForTarget(collect, target, options = {}) {
+  if (!near.length) return "";
+  const offscreen = matchTarget(
+    found.filter((f) => !f.onScreen && !f.hidden),
+    target
+  ).length;
+  const hint = offscreen ? ". {scroll:true} scrolls an off-screen match into view" : "";
+  return `. Near misses: ${near.join("; ")}${hint}`;
+}
+function waitForTarget(collect, target, options = {}, reveal) {
+  if (options.gone && options.scroll)
+    return Promise.reject(
+      new Error("{gone:true} and {scroll:true} can't be combined: gone waits for the target to leave the screen")
+    );
   const timeoutMs = options.timeoutMs ?? 5e3;
   const t0 = performance.now();
   const ms = () => Math.round((performance.now() - t0) * 100) / 100;
@@ -1285,12 +1341,17 @@ function waitForTarget(collect, target, options = {}) {
       if (finished) return;
       try {
         const found = collect();
-        const matches = matchTarget(
-          found.filter((f) => f.onScreen && !f.hidden),
+        const reachable = found.filter((f) => !f.hidden);
+        let matches = matchTarget(
+          reachable.filter((f) => f.onScreen),
           target
         );
+        if (!matches.length && options.scroll && reveal) matches = matchTarget(reachable, target);
         const hit = matches[indexOf(target) ?? 0];
-        if (options.gone ? !hit : hit) {
+        if (hit && !hit.onScreen && reveal) {
+          finish();
+          reveal(hit).then((f) => resolve({ ms: ms(), element: f.element }), reject);
+        } else if (options.gone ? !hit : hit) {
           finish();
           resolve(hit ? { ms: ms(), element: hit.element } : { ms: ms() });
         } else if (performance.now() - t0 >= timeoutMs) {
@@ -1366,18 +1427,20 @@ function createScreen(env) {
     if (!metrics && current.scroller) metrics = metricsOf(current.scroller);
     return { found: current, metrics };
   };
+  const reveal = async (found) => {
+    const shown = (await bringIntoView(found)).found;
+    if (!shown.onScreen)
+      throw new Error(
+        `${describe(shown.element)} is not on screen and no scrollable around it can bring it into view`
+      );
+    return shown;
+  };
   const resolve = async (target, prefer, options) => {
-    let found = resolveTarget(collect(), target, prefer, {
+    const found = resolveTarget(collect(), target, prefer, {
       ...options,
       offscreen: options.scroll
     });
-    if (found.onScreen) return found;
-    found = (await bringIntoView(found)).found;
-    if (!found.onScreen)
-      throw new Error(
-        `${describe(found.element)} is not on screen and no scrollable around it can bring it into view`
-      );
-    return found;
+    return found.onScreen ? found : reveal(found);
   };
   return {
     snapshot(options = {}) {
@@ -1407,10 +1470,17 @@ function createScreen(env) {
       return { filled, element: reread(found).element };
     },
     async press(target, options = {}) {
-      const found = await resolve(target, (f) => !!f.press, options);
-      pressElement(found, options);
+      const { action } = options;
+      if (action !== void 0 && typeof action !== "string")
+        throw new Error(`"action" must be an accessibility action name; got ${JSON.stringify(action)}`);
+      const found = await resolve(
+        target,
+        (f) => action === void 0 ? !!f.press || f.element.kind === "button" : !!f.element.actions?.includes(action),
+        options
+      );
+      const via = pressElement(found, options);
       await settle();
-      return found.element;
+      return via === "onPress" ? found.element : { ...found.element, via };
     },
     /**
      * Scrolls the nearest scrollable of a target (or `within`, or the main one
@@ -1490,7 +1560,7 @@ function createScreen(env) {
       await settle();
       return { refreshed: true };
     },
-    waitFor: (target, options) => waitForTarget(collect, target, options)
+    waitFor: (target, options) => waitForTarget(collect, target, options, reveal)
   };
 }
 
@@ -1508,7 +1578,7 @@ function screenTools() {
       run: (text, options) => screen.findText(text, options)
     },
     "screen.snapshot": {
-      description: "Buttons, inputs, text, and testID or labelled views on screen, with rects and checked/selected/expanded state (a Switch's value is checked). Only the focused screen: unfocused tabs and stack screens, content under an open modal, display:none and accessibility-hidden subtrees are left out, and `hidden` counts the elements skipped. {all:true} lists everything, marking off-screen (onScreen:false) and hidden (hidden:true) ones. A WebView registered with the react-native-webview adapter shows as one `webview` element with its name: use webview.* inside it.",
+      description: 'Buttons, inputs, text, and testID or labelled views on screen, with rects and checked/selected/expanded state (a Switch\'s value is checked). `actions` lists the accessibility actions an element handles; one with "activate" and no onPress (a swipe-to-confirm) is a button screen.press can press. Only the focused screen: unfocused tabs and stack screens, content under an open modal, display:none and accessibility-hidden subtrees are left out, and `hidden` counts the elements skipped. {all:true} lists everything, marking off-screen (onScreen:false) and hidden (hidden:true) ones. A WebView registered with the react-native-webview adapter shows as one `webview` element with its name: use webview.* inside it.',
       run: (options) => screen.snapshot(options)
     },
     "screen.fill": {
@@ -1516,7 +1586,7 @@ function screenTools() {
       run: (target, text, options) => screen.fill(target, text, options)
     },
     "screen.press": {
-      description: `Press a button, then wait for the render. ${TARGET_HELP} Disabled elements are refused; {force:true} presses anyway, to see what the app does on tap. {scroll:true} scrolls an off-screen target into view first.`,
+      description: `Press a button, then wait for the render. ${TARGET_HELP} Disabled elements are refused; {force:true} presses anyway, to see what the app does on tap. {scroll:true} scrolls an off-screen target into view first. With no onPress it sends the "activate" accessibility action, as a screen reader's double tap does (swipe-to-confirm buttons, sliders), and the reply says via:"accessibilityAction:activate". {action:"increment"} (or any name in the element's snapshot \`actions\`) sends that action instead.`,
       run: (target, options) => screen.press(target, options)
     },
     "screen.scroll": {
@@ -1528,7 +1598,7 @@ function screenTools() {
       run: (target, options) => screen.refresh(target, options)
     },
     "screen.waitFor": {
-      description: "Wait until a target is on screen, or gone with {gone:true}. Matches testID, label, placeholder, then the same joined text screen.snapshot shows. Default timeout 5000 ms; a timeout lists near misses.",
+      description: "Wait until a target is on screen, or gone with {gone:true}. Matches testID, label, placeholder, then the same joined text screen.snapshot shows. {scroll:true} also accepts a match rendered off screen and scrolls it into view (not with gone). Default timeout 5000 ms; a timeout lists near misses.",
       run: (target, options) => screen.waitFor(target, options)
     }
   };

package/dist/runtime/index.d.cts

@@ -82,6 +82,8 @@ type ScreenElement = {
     expanded?: boolean;
     /** A WebView registered with the react-native-webview adapter: drive it with `webview.*`. */
     webview?: string;
+    /** `accessibilityActions` it handles with `onAccessibilityAction`, e.g. `activate` on a swipe button. */
+    actions?: string[];
     rect: Rect | null;
     /** Only in `screen.snapshot({ all: true })`. */
     onScreen?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avasapp/agent-bridge",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "Let coding agents drive a running React Native app directly: seed state, flip flags, navigate and check the screen in about a millisecond per call, with no taps.",
   "type": "module",
   "license": "MIT",
@@ -103,8 +103,9 @@
     "build": "bun run generate && rm -rf dist && tsup",
     "test": "bun run generate && bun test src/",
     "typecheck": "bun run generate && tsc -p tsconfig.json --noEmit",
-    "check": "bun run typecheck && bun run test && bun run build && bun run check:gates",
+    "check": "bun run typecheck && bun run test && bun run build && bun run check:gates && bun run check:consumer-types",
     "check:gates": "node scripts/check-gates.mjs",
+    "check:consumer-types": "node scripts/check-consumer-types.mjs",
     "changeset": "changeset",
     "release": "bun run check && changeset publish",
     "prepublishOnly": "bun run check"