@validate.qa/runner 1.0.31 → 1.0.33

package/dist/cli.js

@@ -5001,6 +5001,29 @@ var require_mobile_observation = __commonJS({
   }
 });
 
+// ../runner-core/dist/services/mobile/mobile-keyboard.js
+var require_mobile_keyboard = __commonJS({
+  "../runner-core/dist/services/mobile/mobile-keyboard.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.shouldRetryTapAfterKeyboardDismiss = shouldRetryTapAfterKeyboardDismiss;
+    exports2.dismissKeyboardForRetry = dismissKeyboardForRetry;
+    var EDITABLE_FOCUSED_ROLE_RE = /(EditText|TextField|SecureTextField|SearchField|TextView)$/i;
+    var OUTSIDE_VIEWPORT_ERROR_RE = /(outside|out of).*?(bounds|viewport|visible|screen|window)|coordinate.*?(invalid|outside)/i;
+    function shouldRetryTapAfterKeyboardDismiss(error2, elements) {
+      if (!error2 || !OUTSIDE_VIEWPORT_ERROR_RE.test(error2))
+        return false;
+      return elements.some((el) => el.focused === true && EDITABLE_FOCUSED_ROLE_RE.test(el.role));
+    }
+    async function dismissKeyboardForRetry(driver) {
+      if (typeof driver.dismissKeyboard === "function") {
+        return driver.dismissKeyboard();
+      }
+      return driver.back();
+    }
+  }
+});
+
 // ../runner-core/dist/utils/scrub-credentials.js
 var require_scrub_credentials = __commonJS({
   "../runner-core/dist/utils/scrub-credentials.js"(exports2) {
@@ -61982,6 +62005,7 @@ var require_mobile_explorer = __commonJS({
     var mobile_source_parser_js_1 = require_mobile_source_parser();
     var mobile_observation_js_1 = require_mobile_observation();
     var mobile_boundary_js_1 = require_mobile_boundary();
+    var mobile_keyboard_js_1 = require_mobile_keyboard();
     var credential_tools_js_1 = require_credential_tools();
     var verification_inbox_js_1 = require_verification_inbox();
     var inbox_tools_js_1 = require_inbox_tools();
@@ -61991,6 +62015,7 @@ var require_mobile_explorer = __commonJS({
     var MAX_RECENT_EXCHANGES = 24;
     var OBSERVATION_MAX_ELEMENTS = 50;
     var NO_SNAPSHOT_NUDGE_THRESHOLD = 4;
+    var EXTERNAL_APP_RECOVERY_ATTEMPTS = 2;
     var MOBILE_SNAPSHOT_TOOL = {
       type: "function",
       function: {
@@ -62260,7 +62285,7 @@ var require_mobile_explorer = __commonJS({
       return { screen, signal, refMap, observation };
     }
     function buildStatePacket(input) {
-      const { state: state2, mode, iteration, maxIterations, latestObservation, journeys, transitions } = input;
+      const { state: state2, mode, iteration, maxIterations, latestObservation, journeys, transitions, featureName, featureContext, userNotes } = input;
       const sections = [];
       sections.push(`## Mobile Exploration Status (iteration ${iteration}/${maxIterations})`);
       sections.push(`Mode: ${mode} | Budget remaining: ${maxIterations - iteration} iterations`);
@@ -62273,10 +62298,46 @@ var require_mobile_explorer = __commonJS({
       sections.push("");
       if (mode === "survey") {
         sections.push("**Mission:** Map every reachable screen. For each new screen: mobile_snapshot -> capture_screen -> record_transition. Get PAST the entry gate into the app's real main content \u2014 the login/landing screens are the ENTRANCE, not the app. If test credentials are provided (see the Test Credentials section), SIGN IN with them FIRST and map the authenticated app; that is the real product surface. Prefer a real login when credentials are provided; only if login genuinely cannot be completed after honest attempts (persistent error, the form will not accept the credential, no valid account) fall back to any guest/demo/skip entry the app offers and map the app fully from there \u2014 reaching the real feature surface that way is far better coverage than getting stuck on the login wall. Do NOT submit forms with junk data or mutate real data. Call finish_exploration ONLY when every reachable screen \u2014 including the authenticated content \u2014 has been captured and no unvisited frontier screens remain.");
+      } else if (featureName?.trim()) {
+        sections.push(`**Mission:** Feature-scoped deep exploration of **"${featureName.trim()}"**. Drive the app like a real user through THIS feature only: tap, type, submit, and observe outcomes. After a meaningful flow, call record_journey. Do NOT deep-dive unrelated features. Call finish_exploration when this feature's flows are covered.`);
       } else {
         sections.push("**Mission:** Use the focus features like a real user. Tap, type, submit, and observe outcomes. After a meaningful flow, call record_journey. Call finish_exploration when the flows are covered.");
       }
       sections.push("");
+      if (mode === "deep" && featureName?.trim()) {
+        sections.push(`## Feature: ${featureName.trim()}`);
+        if (featureContext?.plannerDescription?.trim()) {
+          sections.push(featureContext.plannerDescription.trim());
+        }
+        if (featureContext?.priorInsight?.trim()) {
+          sections.push(`Prior insight: ${featureContext.priorInsight.trim()}`);
+        }
+        if (featureContext?.pageIntel && featureContext.pageIntel.length > 0) {
+          sections.push("### Target screens / routes for this feature");
+          for (const page of featureContext.pageIntel.slice(0, 12)) {
+            sections.push(`- ${page.route} (${page.type}): ${page.summary}`);
+          }
+        }
+        if (featureContext?.flowIntel && featureContext.flowIntel.length > 0) {
+          sections.push("### Known flows");
+          for (const flow of featureContext.flowIntel.slice(0, 8)) {
+            sections.push(`- ${flow}`);
+          }
+        }
+        if (featureContext?.otherFeatures && featureContext.otherFeatures.length > 0) {
+          sections.push("### Other features \u2014 do NOT explore these (navigation context only)");
+          for (const other of featureContext.otherFeatures.slice(0, 12)) {
+            const pages = other.pages?.length ? ` [${other.pages.slice(0, 4).join(", ")}]` : "";
+            sections.push(`- ${other.name}${pages}`);
+          }
+        }
+        sections.push("");
+      }
+      if (userNotes?.trim()) {
+        sections.push(`## Operator notes
+${userNotes.trim()}`);
+        sections.push("");
+      }
       const screenCount = state2.getScreenCount();
       sections.push(`## Screens Mapped: ${screenCount} | Transitions: ${transitions.length} | Journeys: ${journeys.length}`);
       const currentScreenId = state2.getCurrentScreenId();
@@ -62433,7 +62494,7 @@ ${existingScreens.slice(0, 100).map((s) => `- ${s.screenId}${s.name ? ` "${s.nam
         } catch {
         }
       };
-      const mode = ctx.mode === "deep" ? "deep" : "survey";
+      const mode = ctx.mode === "survey" ? "survey" : "deep";
       const platform3 = platformForMedium(ctx.medium);
       const enableRecordJourney = config?.enableRecordJourney ?? mode !== "survey";
       const targetAppId = ctx.target?.appId?.trim() || void 0;
@@ -62556,9 +62617,46 @@ ${existingScreens.slice(0, 100).map((s) => `- ${s.screenId}${s.name ? ` "${s.nam
               externalOwner: boundary.owner
             };
           }
-          log2(`   Relaunch still outside target app (${recoveredBoundary.owner}); no screen recorded.`);
+          let lastExternalOwner = recoveredBoundary.owner;
+          for (let attempt = 1; attempt <= EXTERNAL_APP_RECOVERY_ATTEMPTS; attempt += 1) {
+            try {
+              await driver.launchApp();
+              const retrySnap = await driver.snapshot();
+              const retryRecovered = buildResolved(retrySnap.xml, retrySnap.windowSize, retrySnap.screenSignal);
+              if (!retryRecovered)
+                continue;
+              const retryBoundary = (0, mobile_boundary_js_1.classifyMobileScreenBoundary)(retryRecovered.signal, targetAppId, platform3);
+              latest = retryRecovered;
+              lastSnapshotIteration = iterationForObservation;
+              if (retryBoundary.kind === "target" || retryBoundary.kind === "unknown") {
+                const screenId = ingestSnapshot(retryRecovered, iterationForObservation);
+                captureScreenshot(retrySnap.screenshot, screenId);
+                log2(`   Recovered target app after ${attempt} additional activation attempt(s).`);
+                return {
+                  observation: retryRecovered.observation,
+                  screenId,
+                  externalBlocked: true,
+                  externalOwner: boundary.owner
+                };
+              }
+              if (retryBoundary.kind === "transient_external") {
+                log2(`   Recovery surfaced system overlay ${retryBoundary.owner}; not adding it to target-app survey evidence.`);
+                return {
+                  observation: `${retryRecovered.observation}${(0, mobile_boundary_js_1.mobileBoundaryNote)(retryBoundary)}`,
+                  screenId: null,
+                  externalBlocked: true,
+                  transientExternal: true,
+                  externalOwner: boundary.owner
+                };
+              }
+              lastExternalOwner = retryBoundary.owner;
+            } catch (err) {
+              log2(`   Target app recovery attempt ${attempt} failed: ${err instanceof Error ? err.message : String(err)}`);
+            }
+          }
+          log2(`   Relaunch still outside target app (${lastExternalOwner}); no screen recorded.`);
           return {
-            observation: `(left target app ${boundary.targetAppId} for ${boundary.owner}; relaunch still showed ${recoveredBoundary.owner}, so no screen was recorded)`,
+            observation: `(left target app ${boundary.targetAppId} for ${boundary.owner}; relaunch still showed ${lastExternalOwner}, so no screen was recorded)`,
             screenId: null,
             externalBlocked: true,
             externalOwner: boundary.owner
@@ -62684,7 +62782,10 @@ ${existingScreens.slice(0, 100).map((s) => `- ${s.screenId}${s.name ? ` "${s.nam
             maxIterations,
             latestObservation: getLatest()?.observation ?? null,
             journeys,
-            transitions: collectedTransitions
+            transitions: collectedTransitions,
+            featureName: ctx.featureName,
+            featureContext: ctx.featureContext,
+            userNotes: ctx.userNotes
           });
           const messages = [
             { role: "system", content: systemPrompt },
@@ -62936,7 +63037,19 @@ Exploration complete: ${summary}`);
           const fromScreenId = state2.getCurrentScreenId();
           const boundaryBeforeAction = currentBoundary();
           const startedOutsideTarget = boundaryBeforeAction.kind !== "target" && boundaryBeforeAction.kind !== "unknown";
-          const actionResult = await driver.tap(resolved.bounds);
+          let actionResult = await driver.tap(resolved.bounds);
+          if (!actionResult.ok && (0, mobile_keyboard_js_1.shouldRetryTapAfterKeyboardDismiss)(actionResult.error, latest()?.screen.elements ?? [])) {
+            log2("   Tap target was outside the visible viewport while an input was focused; dismissing keyboard and retrying once.");
+            const dismissResult = await (0, mobile_keyboard_js_1.dismissKeyboardForRetry)(driver);
+            const retryResult = await driver.tap(resolved.bounds);
+            actionResult = retryResult.ok ? retryResult : {
+              ...retryResult,
+              error: retryResult.error ? `${retryResult.error} (retry after keyboard dismiss also failed)` : "Tap retry after keyboard dismiss failed",
+              source: retryResult.source ?? dismissResult.source,
+              screenshot: retryResult.screenshot ?? dismissResult.screenshot,
+              screenSignal: retryResult.screenSignal ?? dismissResult.screenSignal
+            };
+          }
           const absorbed = await absorbActionResult(actionResult, "mobile_tap");
           const { observation, screenId } = absorbed;
           if (!startedOutsideTarget && !absorbed.externalBlocked && !absorbed.transientExternal) {
@@ -65936,6 +66049,25 @@ var require_mobile_discovery_prompts = __commonJS({
     function targetAppScreens(graph, appId) {
       return [...graph.screens.values()].filter((state2) => isTargetAppScreenId(state2.screenId, appId));
     }
+    function isGenericNonFeatureScreen(state2) {
+      const type = state2.screenType?.trim().toLowerCase();
+      if (type === "error" || type === "permission")
+        return true;
+      if (type && type !== "unknown")
+        return false;
+      const actionableCount = state2.elements.filter((el) => el.actionable).length;
+      if (actionableCount > 0)
+        return false;
+      const evidenceText = [
+        state2.screenName,
+        state2.screenType,
+        ...state2.observations ?? []
+      ].filter((value) => typeof value === "string" && value.trim().length > 0).join(" ");
+      return /\b(empty|loading|blank|spinner|intermediate|placeholder|no actionable)\b/i.test(evidenceText);
+    }
+    function plannableTargetAppScreens(graph, appId) {
+      return targetAppScreens(graph, appId).filter((state2) => !isGenericNonFeatureScreen(state2));
+    }
     exports2.MOBILE_SURVEY_SYSTEM_PROMPT = `You are a feature analyst for a native mobile application (iOS or Android). You receive evidence from an AI explorer that mapped the app's screens by tapping, typing, and swiping through the live UI. Your job is to organize screens into meaningful feature groups.
 
 ## Output Discipline
@@ -65955,8 +66087,8 @@ Return ONLY one valid JSON object matching the schema below. Do NOT include <thi
 5. CRUD screens for the same entity belong together
 6. Do NOT merge screens into one feature just because they serve a similar broader goal. Treat areas as separate features when the evidence shows separate primary navigation destinations (e.g. separate tab-bar items or drawer links), separate screen families for distinct entities, or different CRUD entities/forms. Keep screens together when they share one navigational area and operate on the same entity (e.g. a list screen, its filter/sort sheet, and its detail screen all belong together).
 7. Feature descriptions MUST reference actual element labels / accessibility-ids from the evidence
-8. Do NOT create standalone features for generic error / empty screens (network-error, permission-denied). If a feature screen is broken or crashes, keep it in its intended feature and note the failure in the description.
-9. COVER EVERY SCREEN: every explored screen except generic error / permission screens MUST appear in exactly one feature group's routes. Do not leave screens ungrouped \u2014 a screen the explorer reached is part of SOME feature. Attach an ambiguous screen to its most closely related feature and note the ambiguity in that feature's description. Sign-in / sign-up / forgot-password screens form an "Authentication" group even when they were only reached via links from other screens.
+8. Do NOT create standalone features for generic error / empty / loading / intermediate screens (network-error, permission-denied, blank WebView, spinner-only loading). If a feature screen is broken or crashes, keep it in its intended feature and note the failure in the description. If a screen has no actionable controls and only says it is empty/loading/intermediate, omit it from featureGroups.routes unless it is the only evidence for a real product feature.
+9. COVER EVERY PRODUCT SCREEN: every explored product screen except generic error / permission / empty / loading / intermediate screens MUST appear in exactly one feature group's routes. Do not leave usable screens ungrouped \u2014 a screen the explorer reached is part of SOME feature. Attach an ambiguous usable screen to its most closely related feature and note the ambiguity in that feature's description. Sign-in / sign-up / forgot-password screens form an "Authentication" group even when they were only reached via links from other screens.
 10. LOGGED-OUT vs LOGGED-IN SEPARATION: screens shown BEFORE the user is signed in (splash, landing/welcome, theme or language pickers, walkthroughs, sign-up, sign-in, forgot-password, demo/preview screens) must NEVER share a feature group with the signed-in app. Put sign-in / sign-up / forgot-password in "Authentication" (rule 4) and the remaining pre-login screens in an "Onboarding" group. Features named after signed-in areas (feeds, dashboards, tabs, settings) must contain ONLY screens reached after authentication. A pre-login flow is a linear sequence, not a navigation destination \u2014 do not let it swallow the app's main features.
 
 ## Output JSON Schema
@@ -66222,8 +66354,36 @@ ${targetBits.length > 0 ? targetBits.join(" ") : "native mobile app"}`);
       if (context.featureName) {
         sections.push(`## Feature: ${context.featureName}
 SCOPE: this is a feature-focused deep run. Plan scenarios ONLY for the "${context.featureName}" feature \u2014 its screens, forms, and flows. Screens belonging to other features are navigation context / prerequisites only; do NOT plan scenarios whose primary goal exercises another feature.`);
+        if (context.featureContext?.plannerDescription?.trim()) {
+          sections.push(context.featureContext.plannerDescription.trim());
+        }
+        if (context.featureContext?.priorInsight?.trim()) {
+          sections.push(`Prior insight: ${context.featureContext.priorInsight.trim()}`);
+        }
+        if (context.featureContext?.pageIntel && context.featureContext.pageIntel.length > 0) {
+          sections.push("### Feature page intel");
+          for (const page of context.featureContext.pageIntel.slice(0, 12)) {
+            sections.push(`- ${page.route} (${page.type}): ${page.summary}`);
+          }
+        }
+        if (context.featureContext?.flowIntel && context.featureContext.flowIntel.length > 0) {
+          sections.push("### Known flows");
+          for (const flow of context.featureContext.flowIntel.slice(0, 8)) {
+            sections.push(`- ${flow}`);
+          }
+        }
+        if (context.featureContext?.otherFeatures && context.featureContext.otherFeatures.length > 0) {
+          sections.push("### Other features (do not plan primary scenarios for these)");
+          for (const other of context.featureContext.otherFeatures.slice(0, 12)) {
+            sections.push(`- ${other.name}`);
+          }
+        }
+      }
+      if (context.userNotes?.trim()) {
+        sections.push(`## Operator notes
+${context.userNotes.trim()}`);
       }
-      const orderedScreens = targetAppScreens(graph, context.appId).sort((a, b) => a.firstSeenIteration - b.firstSeenIteration);
+      const orderedScreens = plannableTargetAppScreens(graph, context.appId).sort((a, b) => a.firstSeenIteration - b.firstSeenIteration);
       const includedScreenIds = new Set(orderedScreens.map((state2) => state2.screenId));
       sections.push(`## Screens Discovered (${orderedScreens.length})`);
       for (const state2 of orderedScreens) {
@@ -66332,7 +66492,7 @@ ${constraints.join("\n")}`);
       const now = /* @__PURE__ */ new Date();
       const idByScreen = /* @__PURE__ */ new Map();
       let pageSeq = 0;
-      const orderedScreens = targetAppScreens(graph, meta.appId).sort((a, b) => a.firstSeenIteration - b.firstSeenIteration);
+      const orderedScreens = plannableTargetAppScreens(graph, meta.appId).sort((a, b) => a.firstSeenIteration - b.firstSeenIteration);
       for (const state2 of orderedScreens) {
         idByScreen.set(state2.screenId, `mpage-${pageSeq++}`);
       }
@@ -66348,7 +66508,7 @@ ${constraints.join("\n")}`);
           routePattern: null,
           title: state2.screenName ?? null,
           pageType: state2.screenType ?? "UNKNOWN",
-          requiresAuth: false,
+          requiresAuth: state2.screenType?.toLowerCase() === "auth",
           visitCount: state2.visited ? 1 : 0,
           lastVisitedAt: state2.visited ? now : null,
           elementsCovered: 0,
@@ -66368,6 +66528,8 @@ ${constraints.join("\n")}`);
         const toPageId = idByScreen.get(t.toScreenId);
         if (!fromPageId || !toPageId)
           continue;
+        const fromScreen = graph.screens.get(t.fromScreenId);
+        const toScreen = graph.screens.get(t.toScreenId);
         transitions.push({
           id: `mtx-${txSeq++}`,
           fromPageId,
@@ -66375,7 +66537,7 @@ ${constraints.join("\n")}`);
           triggerType: t.action.toUpperCase(),
           triggerLabel: t.viaRef ?? null,
           observedCount: 1,
-          requiresAuth: false
+          requiresAuth: fromScreen?.screenType?.toLowerCase() === "auth" || toScreen?.screenType?.toLowerCase() === "auth"
         });
       }
       return {
@@ -66393,7 +66555,7 @@ ${constraints.join("\n")}`);
     }
     function buildMobileFeatureGroupsFromGraph(graph, appId) {
       const groups = /* @__PURE__ */ new Map();
-      const orderedScreens = targetAppScreens(graph, appId).filter((state2) => state2.screenType?.toLowerCase() !== "error").sort((a, b) => a.firstSeenIteration - b.firstSeenIteration);
+      const orderedScreens = plannableTargetAppScreens(graph, appId).sort((a, b) => a.firstSeenIteration - b.firstSeenIteration);
       const includedScreenIds = new Set(orderedScreens.map((state2) => state2.screenId));
       for (const state2 of orderedScreens) {
         const screenTypeLower = state2.screenType?.toLowerCase();
@@ -66440,7 +66602,7 @@ ${constraints.join("\n")}`);
         return [];
       if (input.featureName?.trim())
         return [];
-      const orderedScreens = targetAppScreens(input.graph, input.appId).filter((state2) => state2.screenType?.toLowerCase() !== "error").filter((state2) => state2.visited || state2.firstSeenIteration === 0).sort((a, b) => a.firstSeenIteration - b.firstSeenIteration);
+      const orderedScreens = plannableTargetAppScreens(input.graph, input.appId).filter((state2) => state2.visited || state2.firstSeenIteration === 0).sort((a, b) => a.firstSeenIteration - b.firstSeenIteration);
       if (orderedScreens.length === 0)
         return [];
       const entryScreenId = orderedScreens[0].screenId;
@@ -66578,7 +66740,9 @@ ${constraints.join("\n")}`);
           recordedJourneys,
           credentials: input.credentials,
           testBudget: input.testBudget,
-          incremental: input.incremental
+          incremental: input.incremental,
+          userNotes: input.userNotes,
+          featureContext: input.featureContext
         })
       });
       const plannerFeatureGroups = filterFeatureGroupsToSiteMap(result.featureGroups, siteMap, input.graph, input.appId);
@@ -66642,9 +66806,11 @@ var require_mobile_generator = __commonJS({
     var mobile_source_parser_js_2 = require_mobile_source_parser();
     var mobile_observation_js_1 = require_mobile_observation();
     var mobile_boundary_js_1 = require_mobile_boundary();
+    var mobile_keyboard_js_1 = require_mobile_keyboard();
     var MAX_SCENARIO_ITERATIONS = 30;
     var MAX_CONSECUTIVE_INFRA_FAILURES = 3;
     var MAX_RECENT_EXCHANGES = 24;
+    var EXTERNAL_APP_RECOVERY_ATTEMPTS = 2;
     var OBSERVATION_MAX_ELEMENTS = 50;
     function finalizeAction(input) {
       return { ...input, url: "", selector: input.selector ?? "" };
@@ -66835,8 +67001,38 @@ var require_mobile_generator = __commonJS({
       return (labelIsEditableValue ? void 0 : label) ?? nonEmpty2(element.accessibilityId) ?? nonEmpty2(element.resourceId) ?? (editable ? void 0 : text) ?? "element";
     }
     var EDITABLE_ELEMENT_ROLE_RE = /(EditText|AutoCompleteTextView|XCUIElementTypeTextField|XCUIElementTypeSecureTextField|XCUIElementTypeSearchField|XCUIElementTypeTextView)$/;
+    var EDITABLE_IDENTITY_RE = /\b(email|e-?mail|password|passwd|passcode|username|user[_-]?name|login|search|query|otp|pin|phone|mobile|input|textfield|text[_-]?field|edit|typehere)\b/i;
     function isEditableMobileElement(element) {
-      return EDITABLE_ELEMENT_ROLE_RE.test(element.role.trim());
+      if (EDITABLE_ELEMENT_ROLE_RE.test(element.role.trim()))
+        return true;
+      const identity = [element.accessibilityId, element.resourceId, element.label].filter((v) => typeof v === "string" && v.trim().length > 0).join(" ");
+      if (identity && EDITABLE_IDENTITY_RE.test(identity))
+        return true;
+      return false;
+    }
+    function isIdentityBearingTapTarget(element) {
+      if (weakAssertionTargetReason(element))
+        return false;
+      if (isBareContainerLikeElement(element))
+        return false;
+      if (isEditableMobileElement(element))
+        return false;
+      if (/button|link|tab|menuitem|checkbox|switch|radio/i.test(element.role))
+        return true;
+      const label = [
+        element.label,
+        element.text,
+        element.accessibilityId,
+        element.resourceId
+      ].filter((v) => typeof v === "string" && v.trim().length > 0).join(" ");
+      return /\b(sign\s*in|log\s*in|login|submit|save|continue|create|send|confirm|done|next|apply|checkout|pay|finish|update|register|sign\s*up)\b/i.test(label);
+    }
+    function isBareContainerLikeElement(element) {
+      if (BARE_CONTAINER_CLASS_RE.test(element.role)) {
+        const hasIdentity = Boolean(nonEmpty2(element.text) || nonEmpty2(element.label) || nonEmpty2(element.accessibilityId));
+        return !hasIdentity;
+      }
+      return false;
     }
     function nonEmpty2(value) {
       if (typeof value !== "string")
@@ -67060,10 +67256,47 @@ Start by calling mobile_snapshot, then execute the steps above \u2014 the minimu
               externalOwner: boundary.owner
             };
           }
-          log2(`  relaunch still outside target app (${recoveredBoundary.owner}); no target-app step recorded.`);
+          let lastExternalOwner = recoveredBoundary.owner;
+          let lastRecovered = recovered;
+          for (let attempt = 1; attempt <= EXTERNAL_APP_RECOVERY_ATTEMPTS; attempt += 1) {
+            try {
+              await driver.launchApp();
+              const retrySnap = await driver.snapshot();
+              const retryRecovered = buildResolved(retrySnap.xml, retrySnap.screenSignal, retrySnap.windowSize);
+              if (!retryRecovered)
+                continue;
+              lastRecovered = retryRecovered;
+              const retryBoundary = (0, mobile_boundary_js_1.classifyMobileScreenBoundary)(retryRecovered.signal, targetAppId, platform3);
+              setLatest(retryRecovered);
+              if ((0, mobile_boundary_js_1.isTargetLikeMobileBoundary)(retryBoundary)) {
+                emitScreenshot(retrySnap.screenshot);
+                log2(`  recovered target app after ${attempt} additional activation attempt(s).`);
+                return {
+                  resolved: retryRecovered,
+                  observation: retryRecovered.observation,
+                  externalBlocked: true,
+                  externalOwner: boundary.owner
+                };
+              }
+              if (retryBoundary.kind === "transient_external") {
+                log2(`  recovery surfaced system overlay ${retryBoundary.owner}; not recording it as a target-app step.`);
+                return {
+                  resolved: retryRecovered,
+                  observation: `${retryRecovered.observation}${(0, mobile_boundary_js_1.mobileBoundaryNote)(retryBoundary)}`,
+                  externalBlocked: true,
+                  transientExternal: true,
+                  externalOwner: boundary.owner
+                };
+              }
+              lastExternalOwner = retryBoundary.owner;
+            } catch (err) {
+              log2(`  target app recovery attempt ${attempt} failed: ${err instanceof Error ? err.message : String(err)}`);
+            }
+          }
+          log2(`  relaunch still outside target app (${lastExternalOwner}); no target-app step recorded.`);
           return {
-            resolved: recovered,
-            observation: `(left target app ${boundary.targetAppId} for ${boundary.owner}; relaunch still showed ${recoveredBoundary.owner}, so no target-app step was recorded)`,
+            resolved: lastRecovered,
+            observation: `(left target app ${boundary.targetAppId} for ${boundary.owner}; relaunch still showed ${lastExternalOwner}, so no target-app step was recorded)`,
             externalBlocked: true,
             externalOwner: boundary.owner
           };
@@ -67277,9 +67510,26 @@ ${statePacket}` },
             return unknownRef(toolArgs.ref);
           const beforeScreenName = screenName();
           const before = latest();
-          const result = await driver.tap(element.bounds);
+          let result = await driver.tap(element.bounds);
+          if (!result.ok && (0, mobile_keyboard_js_1.shouldRetryTapAfterKeyboardDismiss)(result.error, before?.screen.elements ?? [])) {
+            log2("  tap target was outside the visible viewport while an input was focused; dismissing keyboard and retrying once.");
+            const dismissResult = await (0, mobile_keyboard_js_1.dismissKeyboardForRetry)(driver);
+            const retryResult = await driver.tap(element.bounds);
+            result = retryResult.ok ? retryResult : {
+              ...retryResult,
+              error: retryResult.error ? `${retryResult.error} (retry after keyboard dismiss also failed)` : "Tap retry after keyboard dismiss failed",
+              source: retryResult.source ?? dismissResult.source,
+              screenshot: retryResult.screenshot ?? dismissResult.screenshot,
+              screenSignal: retryResult.screenSignal ?? dismissResult.screenSignal
+            };
+          }
           const absorbed = await absorbObservation(result.source, result.screenSignal, latest()?.screen.windowSize ?? null, result.screenshot, "mobile_tap");
-          if (shouldRecordAction(result, absorbed) && changedScreen(before, absorbed)) {
+          const screenChanged = changedScreen(before, absorbed);
+          const identityTap = isIdentityBearingTapTarget(element);
+          if (shouldRecordAction(result, absorbed) && (screenChanged || identityTap)) {
+            if (!screenChanged && identityTap) {
+              log2(`  tap left content signature unchanged but target has identity \u2014 recording commit control "${labelForElement(element)}".`);
+            }
             recordAction({
               type: "TAP",
               selector: (0, mobile_source_parser_js_2.preferredLocator)(element),
@@ -67423,6 +67673,13 @@ ${statePacket}` },
           const element = resolveRef(toolArgs.ref);
           if (!element)
             return unknownRef(toolArgs.ref);
+          const weakReason = weakAssertionTargetReason(element);
+          if (weakReason) {
+            return {
+              ok: false,
+              error: `Ref ${element.ref} is not a durable assertion target (${weakReason}). Re-snapshot and assert a human-visible label, text, or stable control that proves the screen outcome.`
+            };
+          }
           const expected = nonEmpty2(typeof toolArgs.expected === "string" ? toolArgs.expected : String(toolArgs.expected ?? ""));
           if (!expected)
             return { ok: false, error: "mobile_assert_text needs a non-empty `expected` value." };
@@ -67681,19 +67938,46 @@ ${statePacket}` },
       if (loginTapWithoutCredentialPath && !hasAnyCredentialEntry && !uiOnlyCredentialScenario && !emptyFieldValidationScenario && (sessionLifecycleScenario || /\b(valid credentials?|happy path|successful sign\s*in|successful login)\b/.test(text))) {
         return "auth/session scenario tapped a login or sign-in control without recording a credential path";
       }
-      if (!isCredentialSignIn)
+      if (isCredentialSignIn) {
+        const typedEmail = typedEmailIndexes.length > 0;
+        const typedPassword = typedPasswordIndexes.length > 0;
+        const tappedSubmit = submitAfterCredentials;
+        if (typedEmail && typedPassword && tappedSubmit) {
+        } else {
+          const missing = [
+            typedEmail ? null : "email/username entry",
+            typedPassword ? null : "password entry",
+            tappedSubmit ? null : "sign-in submit tap"
+          ].filter((value) => value !== null);
+          return `credential sign-in scenario did not record ${missing.join(", ")}`;
+        }
+      }
+      const isHappyPath = /\b(happy\s*path|successful|success|create|save|submit|complete|checkout|send|post)\b/.test(text) || scenario.type === "HAPPY_PATH";
+      if (!isHappyPath)
         return null;
-      const typedEmail = typedEmailIndexes.length > 0;
-      const typedPassword = typedPasswordIndexes.length > 0;
-      const tappedSubmit = submitAfterCredentials;
-      if (typedEmail && typedPassword && tappedSubmit)
+      let lastTypeIndex = -1;
+      let lastAssertIndex = -1;
+      actions.forEach((action, index) => {
+        if (action.type === "TYPE")
+          lastTypeIndex = index;
+        if (action.type === "ASSERT_VISIBLE" || action.type === "ASSERT_TEXT")
+          lastAssertIndex = index;
+      });
+      if (lastTypeIndex < 0 || lastAssertIndex <= lastTypeIndex)
         return null;
-      const missing = [
-        typedEmail ? null : "email/username entry",
-        typedPassword ? null : "password entry",
-        tappedSubmit ? null : "sign-in submit tap"
-      ].filter((value) => value !== null);
-      return `credential sign-in scenario did not record ${missing.join(", ")}`;
+      const typeScreen = actions[lastTypeIndex]?.metadata?.screenName?.trim() ?? "";
+      const assertScreen = actions[lastAssertIndex]?.metadata?.screenName?.trim() ?? "";
+      const screensDiffer = typeScreen !== "" && assertScreen !== "" && typeScreen !== assertScreen;
+      const commitAfterType = actions.some((action, index) => {
+        if (action.type !== "TAP" || index <= lastTypeIndex || index >= lastAssertIndex)
+          return false;
+        const textForAction = actionText(action);
+        return /\b(sign\s*in|log\s*in|login|continue|submit|save|create|send|confirm|done|next|apply|post|checkout|pay|finish|update|register|sign\s*up)\b/i.test(textForAction);
+      });
+      if (screensDiffer && !commitAfterType) {
+        return "form fields were filled then a success assert was recorded without a commit/submit tap between them";
+      }
+      return null;
     }
     function actionCycleKey(action) {
       return `${action.type}|${action.selector}|${action.value ?? ""}`;
@@ -68628,8 +68912,21 @@ For a fix, return the COMPLETE steps array (not a diff).`;
     function coerceSteps(value) {
       if (!Array.isArray(value) || value.length === 0)
         return void 0;
-      const allValid = value.every((step) => isRecord(step) && typeof step.action === "string" && typeof step.order === "number");
-      return allValid ? value : void 0;
+      const steps = [];
+      for (let i = 0; i < value.length; i++) {
+        const step = value[i];
+        if (!isRecord(step) || typeof step.action !== "string" || !step.action.trim()) {
+          return void 0;
+        }
+        const orderRaw = step.order;
+        const order = typeof orderRaw === "number" && Number.isFinite(orderRaw) ? orderRaw : typeof orderRaw === "string" && orderRaw.trim() !== "" && Number.isFinite(Number(orderRaw)) ? Number(orderRaw) : i;
+        steps.push({
+          ...step,
+          order,
+          action: step.action
+        });
+      }
+      return steps.map((step, order) => ({ ...step, order }));
     }
     function parseHealVerdict(content) {
       const cleaned = stripCodeFences(content);
@@ -72850,6 +73147,48 @@ var require_snapshot_observation = __commonJS({
     var PROMOTED_FORM_FIELD_CAP = 12;
     var FORM_MEMBER_CONTAINER_SEGMENT_RE = /(?:^|>\s*)(?:form|group)\b/i;
     var DATA_GRID_CONTAINER_SEGMENT_RE = /(?:^|>\s*)(?:table|grid|rowgroup|row|gridcell|cell)\b/i;
+    var DEEP_NONNAV_CAP_CENSUS = 16;
+    var CENSUS_NAV_LINK_CAP = 60;
+    var CENSUS_MIN_ACTION_GROUP = 3;
+    var DESTRUCTIVE_ACTION_VERB_RE = /^(?:delete|remove|destroy|suspend|deactivate|disable|revoke|ban|block|archive|terminate|reject|cancel|reset|purge|wipe|unpublish|unsubscribe)$/i;
+    function leadingActionVerb(label) {
+      if (!label)
+        return null;
+      const m = label.trim().match(/[A-Za-z]+/);
+      return m ? m[0].toLowerCase() : null;
+    }
+    function isNavLinkEntry(entry) {
+      return entry.element.elementType === "LINK" && !!entry.element.triggersNavigation;
+    }
+    function isRowRepeatedControl(element) {
+      return !!element.enrichment?.rowContext || !!element.containerPath && DATA_GRID_CONTAINER_SEGMENT_RE.test(element.containerPath);
+    }
+    function rowContainerScope(containerPath) {
+      if (!containerPath)
+        return null;
+      const m = containerPath.match(/^(.*?)\s*>\s*row\b/i);
+      return m ? m[1].trim() : containerPath.trim();
+    }
+    function containerScopeLabel(scope) {
+      if (!scope)
+        return null;
+      const landmarks = [...scope.matchAll(/(?:table|grid|treegrid|list|listbox|tree|rowgroup):([^>]+)/gi)];
+      if (landmarks.length > 0)
+        return landmarks[landmarks.length - 1][1].trim();
+      const segs = scope.split(">").map((s) => s.trim()).filter(Boolean);
+      return segs.length ? segs[segs.length - 1] : null;
+    }
+    function rowIdentityKey(element) {
+      const rc = element.enrichment?.rowContext;
+      if (rc)
+        return `rc:${rc}`;
+      const cp = element.containerPath;
+      if (cp) {
+        const m = cp.match(/>\s*row:(.+)$/i);
+        return m ? `row:${m[1].trim()}` : `cp:${cp}`;
+      }
+      return element.ref ? `ref:${element.ref}` : "unknown";
+    }
     function isGroupedFormField(element) {
       if (!FORM_CONTROL_ROLE_RE.test(element.role ?? ""))
         return false;
@@ -72865,6 +73204,7 @@ var require_snapshot_observation = __commonJS({
       const sourceKind = page.snapshotMeta?.sourceKind ?? page.snapshotArtifact?.sourceKind ?? "missing";
       const artifact = page.snapshotArtifact;
       const richRender = options.richRender ?? process.env.DISCOVERY_SNAPSHOT_RICH_RENDER === "true";
+      const rowActionCensus = richRender && options.mode !== "survey" && (options.rowActionCensus ?? process.env.DISCOVERY_SNAPSHOT_ROW_CENSUS === "true");
       const activeScope = inferActiveSnapshotScope(page);
       const ranked = rankSnapshotElements(getScopedSnapshotElements(page, activeScope), withScopeContext({ ...context, richRank: richRender }, activeScope));
       const allInteractive = ranked.filter(({ element }) => isInteractiveCandidate(element)).filter(({ element }) => {
@@ -72878,10 +73218,17 @@ var require_snapshot_observation = __commonJS({
       });
       let interactive;
       if (options.mode === "survey") {
-        const navLinks = allInteractive.filter(({ element }) => element.elementType === "LINK" && element.triggersNavigation);
-        const others = allInteractive.filter(({ element }) => !(element.elementType === "LINK" && element.triggersNavigation));
+        const navLinks = allInteractive.filter(isNavLinkEntry);
+        const others = allInteractive.filter((entry) => !isNavLinkEntry(entry));
         const othersCap = richRender ? 6 : 4;
         interactive = [...navLinks, ...others.slice(0, othersCap)];
+      } else if (rowActionCensus) {
+        const navLinks = allInteractive.filter(isNavLinkEntry);
+        const others = allInteractive.filter((entry) => !isNavLinkEntry(entry));
+        interactive = [
+          ...navLinks.slice(0, CENSUS_NAV_LINK_CAP),
+          ...others.slice(0, options.elementLimit ?? DEEP_NONNAV_CAP_CENSUS)
+        ];
       } else {
         interactive = allInteractive.slice(0, options.elementLimit ?? (richRender ? 8 : 6));
       }
@@ -72894,6 +73241,36 @@ var require_snapshot_observation = __commonJS({
           }
         }
       }
+      if (rowActionCensus && interactive.length > 0) {
+        const shownVerbs = new Set(interactive.filter((entry) => !isNavLinkEntry(entry) && isRowRepeatedControl(entry.element)).map(({ element }) => leadingActionVerb(qualifyElementLabel(element))).filter(Boolean));
+        const bestByVerb = /* @__PURE__ */ new Map();
+        for (const entry of allInteractive) {
+          if (isNavLinkEntry(entry) || !isRowRepeatedControl(entry.element))
+            continue;
+          const verb = leadingActionVerb(qualifyElementLabel(entry.element));
+          if (!verb || !DESTRUCTIVE_ACTION_VERB_RE.test(verb))
+            continue;
+          if (shownVerbs.has(verb))
+            continue;
+          if (interactive.includes(entry))
+            continue;
+          const existing = bestByVerb.get(verb);
+          if (!existing) {
+            bestByVerb.set(verb, entry);
+            continue;
+          }
+          if (existing.element.isDisabled && !entry.element.isDisabled)
+            bestByVerb.set(verb, entry);
+        }
+        const swapIns = [...bestByVerb.values()];
+        if (swapIns.length > 0) {
+          const navShown = interactive.filter(isNavLinkEntry);
+          const nonNavShown = interactive.filter((entry) => !isNavLinkEntry(entry));
+          const evictable = Math.min(swapIns.length, nonNavShown.length);
+          const trimmed = nonNavShown.slice(0, nonNavShown.length - evictable);
+          interactive = [...navShown, ...trimmed, ...swapIns.slice(0, evictable)];
+        }
+      }
       const duplicates = detectDuplicateRoleNameGroups(duplicateScanCandidates);
       const allForms = artifact?.formGroups ?? page.formGroups ?? [];
       const forms = allForms.slice(0, options.formLimit ?? 3);
@@ -73193,6 +73570,54 @@ var require_snapshot_observation = __commonJS({
           const hidden = allInteractive.length - interactive.length;
           if (hidden > 0) {
             lines.push(`  # +${hidden} more interactive element(s) not individually listed (capped) \u2014 some may appear in the duplicates block above; if your target isn't here, narrow the scope or act on it by ref.`);
+            if (rowActionCensus) {
+              const shownSet = new Set(interactive.map((entry) => entry.element));
+              const groups = /* @__PURE__ */ new Map();
+              for (const entry of allInteractive) {
+                const el = entry.element;
+                if (!isRowRepeatedControl(el))
+                  continue;
+                const verb = leadingActionVerb(qualifyElementLabel(el));
+                if (!verb)
+                  continue;
+                const role = (el.role ?? el.elementType ?? "control").toLowerCase();
+                const scope = rowContainerScope(el.containerPath);
+                const key = JSON.stringify([scope ?? "", role, verb]);
+                let group = groups.get(key);
+                if (!group) {
+                  group = { verb, role, scopeLabel: containerScopeLabel(scope), rows: /* @__PURE__ */ new Set(), shownRows: /* @__PURE__ */ new Set(), disabledRows: /* @__PURE__ */ new Set(), controls: 0 };
+                  groups.set(key, group);
+                }
+                const rowKey = rowIdentityKey(el);
+                group.rows.add(rowKey);
+                group.controls += 1;
+                if (shownSet.has(el))
+                  group.shownRows.add(rowKey);
+                if (el.isDisabled)
+                  group.disabledRows.add(rowKey);
+              }
+              const collapsed = [...groups.values()].map((g) => ({
+                verb: g.verb,
+                role: g.role,
+                scopeLabel: g.scopeLabel,
+                total: g.rows.size,
+                shown: g.shownRows.size,
+                disabled: g.disabledRows.size,
+                controls: g.controls
+              })).filter((g) => g.total >= CENSUS_MIN_ACTION_GROUP && g.total > g.shown).sort((a, b) => {
+                const aDestructive = DESTRUCTIVE_ACTION_VERB_RE.test(a.verb) ? 0 : 1;
+                const bDestructive = DESTRUCTIVE_ACTION_VERB_RE.test(b.verb) ? 0 : 1;
+                return aDestructive - bDestructive || b.total - b.shown - (a.total - a.shown);
+              });
+              for (const g of collapsed) {
+                const verbLabel = g.verb.charAt(0).toUpperCase() + g.verb.slice(1);
+                const destructiveTag = DESTRUCTIVE_ACTION_VERB_RE.test(g.verb) ? " [destructive]" : "";
+                const where = g.scopeLabel ? ` in ${yamlScalar(g.scopeLabel)}` : "";
+                const controlsNote = g.controls > g.total ? ` (${g.controls} controls across ${g.total} rows)` : "";
+                const disabledNote = g.disabled > 0 ? `; ${g.disabled} disabled at capture` : "";
+                lines.push(`  #   \u21B3 "${verbLabel}" ${g.role}${destructiveTag}${where}: present on ${g.total} rows${controlsNote} \u2014 ${g.shown} listed above, ${g.total - g.shown} collapsed${disabledNote}; the same action repeats down these rows \u2014 target a specific row by its row identity (the row's Edit link / row_context above), not a bare "${verbLabel}" locator.`);
+              }
+            }
           }
         }
       }
@@ -74215,13 +74640,14 @@ var require_auth_recipe = __commonJS({
   "../runner-core/dist/services/auth-recipe.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.AUTH_MARKER_VERSION = void 0;
+    exports2.RESERVED_RUNNER_ENV_VARS = exports2.AUTH_MARKER_VERSION = void 0;
     exports2.computeRecipeHash = computeRecipeHash;
     exports2.buildAuthRecipe = buildAuthRecipe;
     exports2.authProofLocator = authProofLocator;
     exports2.urlProofPredicateExpr = urlProofPredicateExpr;
     exports2.renderAuthProofAssertion = renderAuthProofAssertion;
     exports2.renderAuthFn = renderAuthFn;
+    exports2.isReservedRunnerEnvVar = isReservedRunnerEnvVar;
     exports2.absoluteRoute = absoluteRoute;
     exports2.renderReplayClickArrow = renderReplayClickArrow;
     exports2.renderReplaySettleArrow = renderReplaySettleArrow;
@@ -74340,6 +74766,17 @@ var require_auth_recipe = __commonJS({
       lines.push(END_MARKER);
       return lines.join("\n");
     }
+    exports2.RESERVED_RUNNER_ENV_VARS = /* @__PURE__ */ new Set([
+      "AUTH_FILE",
+      "SHARED_AUTH_INJECT",
+      "VALIDATE_RUN_ID",
+      "VALIDATE_TASK_ARN",
+      "VALIDATE_RUNNER_AUTH",
+      "VALIDATE_SERVER_URL"
+    ]);
+    function isReservedRunnerEnvVar(key) {
+      return key.startsWith("VALIDATE_") || exports2.RESERVED_RUNNER_ENV_VARS.has(key);
+    }
     function absoluteRoute(route2, baseUrl) {
       try {
         return new URL(route2, baseUrl).href;
@@ -315412,8 +315849,8 @@ var require_mobile_discovery_agent = __commonJS({
           };
         }
         log2("\n\u2500\u2500 Phase 1: EXPLORE \u2500\u2500");
-        const exploreAppDataCleared = await prepareMobileAppStateForDiscovery(driver, target, "explore", log2);
-        log2(exploreAppDataCleared ? "App data cleared \u2014 exploring from a deterministic cold (logged-out) state." : target?.resetPolicy === "PRESERVE_APP_DATA" ? "App data reset skipped by policy \u2014 exploring with preserved app data." : "App data reset unavailable (platform/device policy) \u2014 exploring the app in its current state.");
+        const exploreAppDataCleared = await prepareMobileAppStateForDiscovery(driver, target, "explore", mode, log2);
+        log2(exploreAppDataCleared ? "App data cleared \u2014 exploring from a deterministic cold (logged-out) state." : target?.resetPolicy === "PRESERVE_APP_DATA" ? "App data reset skipped by policy \u2014 exploring with preserved app data." : mode === "survey" && (target?.resetPolicy ?? "AUTO") === "AUTO" ? "App data reset skipped for mobile survey AUTO \u2014 exploring with preserved app data. Use resetPolicy=CLEAR_APP_DATA for a cold logged-out survey." : "App data reset unavailable (platform/device policy) \u2014 exploring the app in its current state.");
         const state2 = new mobile_exploration_state_js_1.MobileExplorationState();
         const maxIterations = getMobileExploreBudget(mode, ctx.incremental);
         const existingScreens = isSurvey && ctx.incremental ? compactExistingScreens(ctx.existingSiteMap) : void 0;
@@ -315444,9 +315881,15 @@ var require_mobile_discovery_agent = __commonJS({
         log2(`
 Explore complete: ${explore.exploreStats.pagesDiscovered} screens, ${explore.exploreStats.elementsFound} elements, ${explore.exploreStats.transitionsFound} transitions (${exploreElapsed}s)`);
         if (callbacks?.onExploreComplete) {
-          await callbacks.onExploreComplete(toExploreCompleteData(explore, collectedTransitions)).catch((err) => {
-            log2(`[stream] explore-complete callback failed: ${err instanceof Error ? err.message : String(err)}`);
-          });
+          try {
+            await callbacks.onExploreComplete(toExploreCompleteData(explore, collectedTransitions));
+          } catch (err) {
+            const message = checkpointErrorMessage(err);
+            log2(`[stream] explore-complete callback failed: ${message}`);
+            if (isTerminalDiscoveryCheckpointError(err)) {
+              throw err;
+            }
+          }
         }
         if (!isSurvey && shouldPauseAfterTruncatedExplore(explore)) {
           const duration2 = (Date.now() - startTime) / 1e3;
@@ -315474,8 +315917,10 @@ Explore complete: ${explore.exploreStats.pagesDiscovered} screens, ${explore.exp
             pausePhase: "explore"
           };
         }
-        log2("\nRelaunching app for a clean state before planning/generation...");
-        await driver.relaunch();
+        if (!isSurvey) {
+          log2("\nRelaunching app for a clean state before planning/generation...");
+          await driver.relaunch();
+        }
         log2("\n\u2500\u2500 Phase 2: PLAN \u2500\u2500");
         const graph = state2.toScreenGraph();
         const screenMap = state2.buildInMemoryScreenMap();
@@ -315498,7 +315943,9 @@ Explore complete: ${explore.exploreStats.pagesDiscovered} screens, ${explore.exp
             hasPassword: !!ctx.variableContext?.allTestVariables?.TEST_USER_PASSWORD || !!ctx.variableContext?.publicTestVariables?.TEST_USER_PASSWORD
           },
           incremental: ctx.incremental,
-          testBudget
+          testBudget,
+          userNotes: ctx.userNotes,
+          featureContext: ctx.featureContext
         }, {
           modelOverride: ctx.planModel ?? ctx.generateModel,
           onAICall
@@ -315655,10 +316102,11 @@ Fatal error: ${msg}`);
         };
       }
     }
-    async function prepareMobileAppStateForDiscovery(driver, target, phase, log2) {
+    async function prepareMobileAppStateForDiscovery(driver, target, phase, mode, log2) {
       void phase;
       const resetPolicy = target?.resetPolicy ?? "AUTO";
-      if (resetPolicy === "PRESERVE_APP_DATA") {
+      const shouldPreserveAppData = resetPolicy === "PRESERVE_APP_DATA" || mode === "survey" && resetPolicy === "AUTO";
+      if (shouldPreserveAppData) {
         try {
           await driver.relaunch();
         } catch (err) {
@@ -315670,10 +316118,20 @@ Fatal error: ${msg}`);
         log2(`App-data reset failed: ${err instanceof Error ? err.message : String(err)}`);
         return false;
       }) ?? false;
-      if (!cleared && resetPolicy === "CLEAR_APP_DATA") {
-        log2("CLEAR_APP_DATA requested but app-data reset was unavailable; continuing without clearing app data.");
+      if (cleared)
+        return true;
+      if (resetPolicy === "CLEAR_APP_DATA") {
+        log2("CLEAR_APP_DATA requested but app-data reset was unavailable; a post-explore relaunch will reset state before planning.");
+      }
+      if (mode !== "survey") {
+        return false;
       }
-      return cleared;
+      try {
+        await driver.relaunch();
+      } catch (err) {
+        log2(`App relaunch failed after unsuccessful app-data reset: ${err instanceof Error ? err.message : String(err)}`);
+      }
+      return false;
     }
     function shouldPauseAfterTruncatedExplore(explore) {
       return explore.truncated === true && (explore.truncatedReason === "rate_limit" || explore.truncatedReason === "timeout");
@@ -315720,6 +316178,7 @@ var require_discover_agent = __commonJS({
     var claude_discovery_runner_js_1 = require_claude_discovery_runner();
     var agentic_cli_constants_js_1 = require_agentic_cli_constants();
     var canvas_detector_js_1 = require_canvas_detector();
+    var auth_recipe_js_1 = require_auth_recipe();
     async function runCanvasPreflight(ctx, sharedBrowser, log2) {
       const cached = ctx.appRenderType ?? null;
       const engine = (0, agentic_cli_constants_js_1.getAgenticEngine)(ctx.exploreModel);
@@ -316415,7 +316874,7 @@ Health: ${healthSummary.totalIssues} issue(s) - ${healthSummary.consoleErrors.le
           }
           if (envRefs.size > 0) {
             const existingKeys = new Set(ctx.variableContext.availableVariableKeys);
-            const missing = [...envRefs].filter((k) => !existingKeys.has(k));
+            const missing = [...envRefs].filter((k) => !existingKeys.has(k) && !(0, auth_recipe_js_1.isReservedRunnerEnvVar)(k));
             if (missing.length > 0) {
               autoVariableDefaults = {};
               for (const key of missing) {
@@ -316931,7 +317390,7 @@ Health: ${healthSummary.totalIssues} issue(s) - ${healthSummary.consoleErrors.le
             envRefs.add(match[1]);
           if (envRefs.size > 0) {
             const existingKeys = new Set(ctx.variableContext.availableVariableKeys);
-            const missing = [...envRefs].filter((k) => !existingKeys.has(k));
+            const missing = [...envRefs].filter((k) => !existingKeys.has(k) && !(0, auth_recipe_js_1.isReservedRunnerEnvVar)(k));
             if (missing.length > 0) {
               autoVariableDefaults = {};
               for (const key of missing) {
@@ -329813,9 +330272,9 @@ var require_dist2 = __commonJS({
       for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports3, p)) __createBinding(exports3, m, p);
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.buildImportSystemRules = exports2.buildImportKickoff = exports2.buildImportContractMd = exports2.MAX_ARCHIVE_BYTES = exports2.isUnsafeEntryName = exports2.extractZipSafely = exports2.downloadArchiveCapped = exports2.detectArchiveKind = exports2.acquireRepoForImport = exports2.runFrameworkImportOnRunner = exports2.getAgenticEngine = exports2.resolveRefFromSnapshot = exports2.replayAuthRecipeIntoBrowser = exports2.runRegisterCaptureRun = exports2.runLoginCaptureRun = exports2.AUTH_MARKER_VERSION = exports2.buildHealAuthStamp = exports2.extractAuthRegion = exports2.upsertAuthBlock = exports2.buildAuthRecipe = exports2.commandToReplayStep = exports2.buildReplayPlan = exports2.absoluteRoute = exports2.renderReplaySettleArrow = exports2.renderReplayClickArrow = exports2.renderAuthFn = exports2.canonicalizeRoute = exports2.executeGrokPerBatchHeal = exports2.executeGrokPerTestHeal = exports2.headerVal = exports2.classifyAuthType = exports2.isTextExcerptable = exports2.isStaticAssetByExt = exports2.isApiCall = exports2.buildApiCallSummary = exports2.computeMobileHealOutcome = exports2.detectMobileStepSecretLeak = exports2.redactMobileSecretsFromText = exports2.MOBILE_LIVE_HEAL_SYSTEM_PROMPT = exports2.MOBILE_SCRIPT_HEAL_SYSTEM_PROMPT = exports2.executeMobileLiveHeal = exports2.executeMobileTestWithHealing = exports2.executeMobileScriptDrivenHeal = exports2.runMobileGeneratePhase = exports2.runMobileAIPlanner = exports2.buildMobileSiteMap = exports2.formatMobileEvidenceForPlanner = exports2.MOBILE_SCENARIO_SYSTEM_PROMPT = exports2.MOBILE_SURVEY_SYSTEM_PROMPT = exports2.runMobileExplorePhase = void 0;
-    exports2.UnsupportedRendererError = exports2.buildCanvasModeAuthoringAddendum = exports2.buildUnsupportedRendererMessage = exports2.modelSupportsVision = exports2.decideCanvasStrategy = exports2.decideAppRenderType = exports2.detectCanvasApp = exports2.detectRateLimitBlock = exports2.isSafeCanonicalRedirect = exports2.resolveBaseUrlPreflight = exports2.checkBaseUrlRedirect = exports2.stripJsonFences = exports2.scrubCredentials = exports2.withAIRetry = exports2.snapshotMatchingChildren = exports2.findNewChromiumChildPid = exports2.killProcessTree = exports2.gracefulCloseWithTreeKill = exports2.liveBrowserRegistry = exports2.REPO_SWITCH_REMOVED_FRACTION = exports2.MAX_MANIFEST_FILES = exports2.toDiffSummary = exports2.isLikelyTestFile = exports2.sanitizeRepoRelPath = exports2.sha256Hex = exports2.hashFiles = exports2.enumerateTestFiles = exports2.buildNextManifest = exports2.detectRepoSwitch = exports2.classifyImportDiff = exports2.parseImportManifest = exports2.REPO_ANALYSIS_SCHEMA_VERSION = exports2.validateSourceEndpoints = exports2.validateAuthoredTest = exports2.validateRepoMapFile = exports2.validateRepoMemoryFile = exports2.buildTestingStandardsSection = exports2.buildRepoAuthorSystemRules = exports2.buildRepoAuthorKickoff = exports2.buildRepoAuthorContractMd = exports2.buildRepoMapSystemRules = exports2.buildRepoMapKickoff = exports2.buildRepoMapContractMd = exports2.buildRepoMemorySystemRules = exports2.buildRepoMemoryKickoff = exports2.buildRepoMemoryContractMd = exports2.runRepoAnalysisOnRunner = exports2.IMPORT_SCHEMA_VERSION = exports2.validateImportResultFile = exports2.validateImportedTest = void 0;
-    exports2.UNSUPPORTED_RENDERER_PREFIX = void 0;
+    exports2.buildImportContractMd = exports2.MAX_ARCHIVE_BYTES = exports2.isUnsafeEntryName = exports2.extractZipSafely = exports2.downloadArchiveCapped = exports2.detectArchiveKind = exports2.acquireRepoForImport = exports2.runFrameworkImportOnRunner = exports2.getAgenticEngine = exports2.resolveRefFromSnapshot = exports2.replayAuthRecipeIntoBrowser = exports2.runRegisterCaptureRun = exports2.runLoginCaptureRun = exports2.isReservedRunnerEnvVar = exports2.RESERVED_RUNNER_ENV_VARS = exports2.AUTH_MARKER_VERSION = exports2.buildHealAuthStamp = exports2.extractAuthRegion = exports2.upsertAuthBlock = exports2.buildAuthRecipe = exports2.commandToReplayStep = exports2.buildReplayPlan = exports2.absoluteRoute = exports2.renderReplaySettleArrow = exports2.renderReplayClickArrow = exports2.renderAuthFn = exports2.canonicalizeRoute = exports2.executeGrokPerBatchHeal = exports2.executeGrokPerTestHeal = exports2.headerVal = exports2.classifyAuthType = exports2.isTextExcerptable = exports2.isStaticAssetByExt = exports2.isApiCall = exports2.buildApiCallSummary = exports2.computeMobileHealOutcome = exports2.detectMobileStepSecretLeak = exports2.redactMobileSecretsFromText = exports2.MOBILE_LIVE_HEAL_SYSTEM_PROMPT = exports2.MOBILE_SCRIPT_HEAL_SYSTEM_PROMPT = exports2.executeMobileLiveHeal = exports2.executeMobileTestWithHealing = exports2.executeMobileScriptDrivenHeal = exports2.runMobileGeneratePhase = exports2.runMobileAIPlanner = exports2.buildMobileSiteMap = exports2.formatMobileEvidenceForPlanner = exports2.MOBILE_SCENARIO_SYSTEM_PROMPT = exports2.MOBILE_SURVEY_SYSTEM_PROMPT = exports2.runMobileExplorePhase = void 0;
+    exports2.buildUnsupportedRendererMessage = exports2.modelSupportsVision = exports2.decideCanvasStrategy = exports2.decideAppRenderType = exports2.detectCanvasApp = exports2.detectRateLimitBlock = exports2.isSafeCanonicalRedirect = exports2.resolveBaseUrlPreflight = exports2.checkBaseUrlRedirect = exports2.stripJsonFences = exports2.scrubCredentials = exports2.withAIRetry = exports2.snapshotMatchingChildren = exports2.findNewChromiumChildPid = exports2.killProcessTree = exports2.gracefulCloseWithTreeKill = exports2.liveBrowserRegistry = exports2.REPO_SWITCH_REMOVED_FRACTION = exports2.MAX_MANIFEST_FILES = exports2.toDiffSummary = exports2.isLikelyTestFile = exports2.sanitizeRepoRelPath = exports2.sha256Hex = exports2.hashFiles = exports2.enumerateTestFiles = exports2.buildNextManifest = exports2.detectRepoSwitch = exports2.classifyImportDiff = exports2.parseImportManifest = exports2.REPO_ANALYSIS_SCHEMA_VERSION = exports2.validateSourceEndpoints = exports2.validateAuthoredTest = exports2.validateRepoMapFile = exports2.validateRepoMemoryFile = exports2.buildTestingStandardsSection = exports2.buildRepoAuthorSystemRules = exports2.buildRepoAuthorKickoff = exports2.buildRepoAuthorContractMd = exports2.buildRepoMapSystemRules = exports2.buildRepoMapKickoff = exports2.buildRepoMapContractMd = exports2.buildRepoMemorySystemRules = exports2.buildRepoMemoryKickoff = exports2.buildRepoMemoryContractMd = exports2.runRepoAnalysisOnRunner = exports2.IMPORT_SCHEMA_VERSION = exports2.validateImportResultFile = exports2.validateImportedTest = exports2.buildImportSystemRules = exports2.buildImportKickoff = void 0;
+    exports2.UNSUPPORTED_RENDERER_PREFIX = exports2.UnsupportedRendererError = exports2.buildCanvasModeAuthoringAddendum = void 0;
     __exportStar(require_ai_provider(), exports2);
     __exportStar(require_mobile_types(), exports2);
     __exportStar(require_mobile_source_parser(), exports2);
@@ -329952,6 +330411,12 @@ var require_dist2 = __commonJS({
     Object.defineProperty(exports2, "AUTH_MARKER_VERSION", { enumerable: true, get: function() {
       return auth_recipe_js_1.AUTH_MARKER_VERSION;
     } });
+    Object.defineProperty(exports2, "RESERVED_RUNNER_ENV_VARS", { enumerable: true, get: function() {
+      return auth_recipe_js_1.RESERVED_RUNNER_ENV_VARS;
+    } });
+    Object.defineProperty(exports2, "isReservedRunnerEnvVar", { enumerable: true, get: function() {
+      return auth_recipe_js_1.isReservedRunnerEnvVar;
+    } });
     var auth_capture_run_js_1 = require_auth_capture_run();
     Object.defineProperty(exports2, "runLoginCaptureRun", { enumerable: true, get: function() {
       return auth_capture_run_js_1.runLoginCaptureRun;
@@ -330179,7 +330644,7 @@ var require_package4 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@validate.qa/runner",
-      version: "1.0.31",
+      version: "1.0.33",
       description: "validate local test runner - execute Playwright tests on your machine, connected to validate.qa cloud.",
       bin: {
         "validate-runner": "dist/cli.js"
@@ -330795,25 +331260,53 @@ async function resolveTypeTargetElementId(sessionPath, bounds) {
   }
   return elementId;
 }
+async function sendKeysToFocusedInput(sessionPath, value) {
+  await appiumRequest(`${sessionPath}/keys`, {
+    method: "POST",
+    body: JSON.stringify({ text: value, value: Array.from(value) })
+  });
+}
 async function typeText(sessionPath, value, bounds) {
   const elementId = await resolveTypeTargetElementId(sessionPath, bounds);
-  if (!elementId) {
-    throw new Error("No focused element available for TYPE. Tap an input field first.");
+  if (elementId) {
+    try {
+      await appiumRequest(`${sessionPath}/element/${elementId}/value`, {
+        method: "POST",
+        body: JSON.stringify({ text: value })
+      });
+      return;
+    } catch (err) {
+      if (isAppiumDriverDeadError(err)) throw err;
+    }
   }
-  await appiumRequest(`${sessionPath}/element/${elementId}/value`, {
-    method: "POST",
-    body: JSON.stringify({ text: value })
-  });
+  await sendKeysToFocusedInput(sessionPath, value);
 }
 async function clearField(sessionPath, bounds) {
   const elementId = await resolveTypeTargetElementId(sessionPath, bounds);
-  if (!elementId) {
-    throw new Error("No focused element available for CLEAR. Tap an input field first.");
+  if (elementId) {
+    try {
+      await appiumRequest(`${sessionPath}/element/${elementId}/clear`, {
+        method: "POST",
+        body: JSON.stringify({})
+      });
+      return;
+    } catch (err) {
+      if (isAppiumDriverDeadError(err)) throw err;
+    }
+  }
+  try {
+    await appiumRequest(`${sessionPath}/keys`, {
+      method: "POST",
+      // Common select-all + delete sequence is platform-dependent; empty keys
+      // after focus is the portable baseline Appium accepts for many hybrids.
+      body: JSON.stringify({ text: "", value: [] })
+    });
+  } catch (err) {
+    if (isAppiumDriverDeadError(err)) throw err;
+    throw new Error(
+      `No focused element available for CLEAR. Tap an input field first.${err instanceof Error ? ` (${err.message})` : ""}`
+    );
   }
-  await appiumRequest(`${sessionPath}/element/${elementId}/clear`, {
-    method: "POST",
-    body: JSON.stringify({})
-  });
 }
 async function swipe(sessionPath, direction, distance, windowSize) {
   const dist = clampMobileSwipeDistance(distance);
@@ -330843,6 +331336,37 @@ async function swipe(sessionPath, direction, distance, windowSize) {
 async function pressBack(sessionPath) {
   await appiumRequest(`${sessionPath}/back`, { method: "POST", body: "{}" });
 }
+function isKeyboardAlreadyHiddenError(err) {
+  const message = err instanceof Error ? err.message : String(err);
+  return /keyboard.*(not|already).*(shown|visible|present|open)|no.*keyboard/i.test(message);
+}
+async function dismissKeyboard(sessionPath, platform3) {
+  if (platform3 === "ANDROID") {
+    await pressBack(sessionPath);
+    return;
+  }
+  try {
+    await appiumRequest(`${sessionPath}/appium/device/hide_keyboard`, {
+      method: "POST",
+      body: "{}"
+    });
+    return;
+  } catch (err) {
+    if (isAppiumDriverDeadError(err)) throw err;
+    if (isKeyboardAlreadyHiddenError(err)) return;
+  }
+  try {
+    await appiumRequest(`${sessionPath}/execute/sync`, {
+      method: "POST",
+      body: JSON.stringify({ script: "mobile: hideKeyboard", args: [{}] })
+    });
+    return;
+  } catch (err) {
+    if (isAppiumDriverDeadError(err)) throw err;
+    if (isKeyboardAlreadyHiddenError(err)) return;
+  }
+  await pressBack(sessionPath);
+}
 async function pressHome(sessionPath, platform3) {
   if (platform3 === "IOS") {
     await appiumRequest(`${sessionPath}/execute/sync`, {
@@ -332020,6 +332544,10 @@ async function startMobileNetworkCapture(options) {
 
 // src/services/appium-executor.ts
 var DEFAULT_STEP_TIMEOUT_MS = 1e4;
+var ELEMENT_ID_PATTERN2 = /^[A-Za-z0-9._:-]{1,128}$/;
+function validateElementId(elementId) {
+  return typeof elementId === "string" && ELEMENT_ID_PATTERN2.test(elementId) ? elementId : null;
+}
 var MOBILE_NEW_COMMAND_TIMEOUT_SECONDS = (() => {
   const raw = Number(process.env.VALIDATEQA_MOBILE_NEW_COMMAND_TIMEOUT);
   return Number.isFinite(raw) && raw > 0 ? Math.floor(raw) : 600;
@@ -332154,6 +332682,9 @@ async function createSession(target) {
   });
   const sessionId = result?.value?.sessionId ?? result?.sessionId;
   if (!sessionId) throw new Error("Appium session creation returned no session ID");
+  if (target.platform === "ANDROID") {
+    await prepareAndroidInputEnvironment(target.deviceId);
+  }
   return sessionId;
 }
 var TERMINAL_SESSION_START = /not installed|no such (app|file)|could not confirm|bundle ?id .*(not|missing)|xcodeorgid|signing|provisioning|not authorized|unauthorized/i;
@@ -332541,7 +333072,9 @@ async function findElement(sessionId, target, timeoutMs = DEFAULT_STEP_TIMEOUT_M
           method: "POST",
           body: JSON.stringify({ using: strategy.using, value: strategy.value })
         });
-        const elementId = result?.value?.ELEMENT || result?.value?.["element-6066-11e4-a52e-4f735466cecf"];
+        const elementId = validateElementId(
+          result?.value?.ELEMENT || result?.value?.["element-6066-11e4-a52e-4f735466cecf"]
+        );
         if (elementId) return elementId;
       } catch (err) {
         if (isTransportError(err)) throw err;
@@ -332581,24 +333114,25 @@ async function tapCoordinates(sessionId, bounds) {
     })
   });
 }
-async function getActiveElementId2(sessionId) {
-  try {
-    const activeEl = await wdRequest(`/session/${sessionId}/element/active`);
-    return activeEl?.value?.ELEMENT || activeEl?.value?.["element-6066-11e4-a52e-4f735466cecf"] || null;
-  } catch {
-    return null;
-  }
-}
-async function sendKeysToFocusedInput(sessionId, value) {
-  await wdRequest(`/session/${sessionId}/keys`, {
-    method: "POST",
-    body: JSON.stringify({ text: value, value: Array.from(value) })
-  });
-}
 function encodeAndroidInputText(value) {
   const inputEncoded = value.replace(/%/g, "%25").replace(/\s/g, "%s");
   return `'${inputEncoded.replace(/'/g, `'\\''`)}'`;
 }
+async function prepareAndroidInputEnvironment(deviceId) {
+  if (!deviceId) return;
+  const settingsToDisable = [
+    ["secure", "stylus_handwriting_enabled", "0"]
+  ];
+  for (const [namespace, key, value] of settingsToDisable) {
+    try {
+      await execFileAsync2("adb", ["-s", deviceId, "shell", "settings", "put", namespace, key, value], {
+        timeout: 8e3,
+        windowsHide: true
+      });
+    } catch {
+    }
+  }
+}
 async function sendAndroidTextToFocusedInput(deviceId, value) {
   if (!deviceId) {
     throw new Error("Android keyboard fallback requires a device id");
@@ -332660,100 +333194,28 @@ async function executeType(sessionId, step, context) {
   if (step.value === void 0 || step.value === null || step.value === "") return;
   const value = String(step.value);
   const bounds = boundsForRun(step, context.platform, context.isCrossPlatform ?? false);
-  let elementId = null;
-  let lastInputError = null;
-  let tappedBounds = false;
-  if (bounds) {
-    await tapCoordinates(sessionId, bounds);
-    tappedBounds = true;
-    await new Promise((resolve) => setTimeout(resolve, MOBILE_FOCUS_SETTLE_MS));
-    elementId = await getActiveElementId2(sessionId);
-    if (elementId) {
-      lastInputError = await trySendElementValue(sessionId, elementId, value);
-      if (!lastInputError) return;
-      elementId = null;
-    }
-  }
-  if (step.target) {
-    try {
-      elementId = await findElement(sessionId, step.target, readStepTimeout(step), { platform: context.platform });
-      lastInputError = await trySendElementValue(sessionId, elementId, value);
-      if (!lastInputError) return;
-      elementId = null;
-    } catch (error2) {
-      if (isTransportError(error2) || !bounds || buildLocatorStrategies(step.target, context.platform).length > 0) throw error2;
-      lastInputError = error2;
-    }
-  }
-  if (!elementId && bounds) {
-    await tapCoordinates(sessionId, bounds);
-    tappedBounds = true;
-    await new Promise((resolve) => setTimeout(resolve, MOBILE_FOCUS_SETTLE_MS));
-    elementId = await getActiveElementId2(sessionId);
-  }
-  if (!elementId) {
-    elementId = await getActiveElementId2(sessionId);
-  }
-  if (elementId) {
-    lastInputError = await trySendElementValue(sessionId, elementId, value);
-    if (!lastInputError) return;
-    elementId = null;
-    if (!bounds) {
-      throw lastInputError instanceof Error ? lastInputError : new Error(String(lastInputError));
-    }
-  }
-  if (bounds) {
-    if (!tappedBounds) {
-      await tapCoordinates(sessionId, bounds);
-      tappedBounds = true;
-      await new Promise((resolve) => setTimeout(resolve, MOBILE_FOCUS_SETTLE_MS));
-    }
-    try {
-      await sendKeysToFocusedInput(sessionId, value);
-      return;
-    } catch (error2) {
-      if (isTransportError(error2)) throw error2;
-      lastInputError = error2;
-    }
-  }
-  if (context.platform === "ANDROID" && tappedBounds) {
-    try {
-      context.log?.("  Appium active-element send failed; using Android focused-keyboard input fallback");
-      await sendAndroidTextToFocusedInput(context.deviceId, value);
-      await new Promise((resolve) => setTimeout(resolve, MOBILE_FOCUS_SETTLE_MS));
-      return;
-    } catch (error2) {
-      if (isTransportError(error2)) throw error2;
-      lastInputError = error2;
+  const sessionPath = `/session/${sessionId}`;
+  try {
+    await typeText(sessionPath, value, bounds);
+    return;
+  } catch (error2) {
+    if (isTransportError(error2)) throw error2;
+    if (context.platform === "ANDROID" && bounds) {
+      try {
+        context.log?.("  Appium active-element send failed; using Android focused-keyboard input fallback");
+        await sendAndroidTextToFocusedInput(context.deviceId, value);
+        await new Promise((resolve) => setTimeout(resolve, MOBILE_FOCUS_SETTLE_MS));
+        return;
+      } catch (androidError) {
+        if (isTransportError(androidError)) throw androidError;
+      }
     }
+    throw error2 instanceof Error ? error2 : new Error(String(error2));
   }
-  throw new Error(`TYPE step could not send text to the focused target${lastInputError instanceof Error ? `: ${lastInputError.message}` : ""}`);
 }
 async function executeClear(sessionId, step, platform3, isCrossPlatform = false) {
   const bounds = boundsForRun(step, platform3, isCrossPlatform);
-  let elementId = null;
-  if (step.target) {
-    try {
-      elementId = await findElement(sessionId, step.target, readStepTimeout(step), { platform: platform3 });
-    } catch (error2) {
-      if (isTransportError(error2) || !bounds || buildLocatorStrategies(step.target, platform3).length > 0) throw error2;
-    }
-  }
-  if (!elementId && bounds) {
-    await tapCoordinates(sessionId, bounds);
-    await new Promise((resolve) => setTimeout(resolve, MOBILE_FOCUS_SETTLE_MS));
-    elementId = await getActiveElementId2(sessionId);
-  }
-  if (!elementId) {
-    elementId = await getActiveElementId2(sessionId);
-  }
-  if (!elementId) {
-    throw new Error("CLEAR step could not resolve a target or focused element");
-  }
-  await wdRequest(`/session/${sessionId}/element/${elementId}/clear`, {
-    method: "POST",
-    body: "{}"
-  });
+  await clearField(`/session/${sessionId}`, bounds);
 }
 async function executeSwipe(sessionId, step) {
   const direction = step.metadata?.direction || "up";
@@ -334836,6 +335298,10 @@ var MobileBridgeDriver = class {
   async back() {
     return this.runAction(() => pressBack(this.sessionPath));
   }
+  /** Platform-aware software keyboard dismissal. */
+  async dismissKeyboard() {
+    return this.runAction(() => dismissKeyboard(this.sessionPath, this.platform));
+  }
   /** System Home — backgrounds the app only (use `relaunch` for hermetic reset). */
   async home() {
     return this.runAction(() => pressHome(this.sessionPath, this.platform));
@@ -335221,8 +335687,12 @@ function attachMobileDiscoveryNetworkContext(calls, result, appId) {
     pageUrl: call.pageUrl ?? pageUrl
   }));
 }
+var runnerPackage = require_package4();
 var SECRET_VAR_PATTERN = /password|secret|token|api[_]?key|pass\b|credential|bearer|pat\b/i;
 var IS_CLOUD = process.env.RUNNER_CLOUD === "true";
+var RUNNER_NAME = runnerPackage.name ?? "@validate.qa/runner";
+var RUNNER_VERSION = runnerPackage.version ?? "0.0.0";
+var RUNNER_BUILD_ID = process.env.VALIDATE_RUNNER_BUILD_ID ?? process.env.RAILWAY_GIT_COMMIT_SHA ?? process.env.GIT_COMMIT_SHA ?? process.env.SOURCE_VERSION;
 var DEFAULT_MAX_CONCURRENT = IS_CLOUD ? 4 : 40;
 var DEFAULT_TYPE_LIMITS = {
   discovery: IS_CLOUD ? 2 : 15,
@@ -338056,6 +338526,9 @@ async function startRunner(opts) {
         method: "POST",
         headers,
         body: JSON.stringify({
+          runnerName: RUNNER_NAME,
+          runnerVersion: RUNNER_VERSION,
+          runnerBuildId: RUNNER_BUILD_ID,
           runsCompleted,
           activeRuns,
           maxConcurrent: MAX_CONCURRENT,