@validate.qa/runner 1.0.5 → 1.0.6

package/dist/cli.mjs

@@ -1042,6 +1042,65 @@ var require_mobile_source_parser = __commonJS({
   }
 });
 
+// ../runner-core/dist/services/mobile/mobile-boundary.js
+var require_mobile_boundary = __commonJS({
+  "../runner-core/dist/services/mobile/mobile-boundary.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.mobileOwnerFromScreenSignal = mobileOwnerFromScreenSignal;
+    exports.isTransientMobileSystemOwner = isTransientMobileSystemOwner;
+    exports.classifyMobileScreenBoundary = classifyMobileScreenBoundary2;
+    exports.isTargetLikeMobileBoundary = isTargetLikeMobileBoundary2;
+    exports.mobileBoundaryNote = mobileBoundaryNote;
+    var ANDROID_TRANSIENT_SYSTEM_APP_IDS = /* @__PURE__ */ new Set([
+      "com.android.permissioncontroller",
+      "com.google.android.permissioncontroller",
+      "com.android.packageinstaller",
+      "com.google.android.packageinstaller"
+    ]);
+    var IOS_TRANSIENT_SYSTEM_APP_IDS = /* @__PURE__ */ new Set([
+      "com.apple.springboard"
+    ]);
+    function mobileOwnerFromScreenSignal(signal, targetAppId) {
+      const bundleId = signal.bundleId?.trim();
+      if (bundleId)
+        return bundleId;
+      const activity = signal.activity?.trim();
+      if (activity && targetAppId && (activity === targetAppId || activity.startsWith(`${targetAppId}.`))) {
+        return targetAppId;
+      }
+      return null;
+    }
+    function isTransientMobileSystemOwner(owner, platform3) {
+      return platform3 === "ANDROID" ? ANDROID_TRANSIENT_SYSTEM_APP_IDS.has(owner) : IOS_TRANSIENT_SYSTEM_APP_IDS.has(owner);
+    }
+    function classifyMobileScreenBoundary2(signal, targetAppId, platform3) {
+      if (!targetAppId)
+        return { kind: "target" };
+      const owner = mobileOwnerFromScreenSignal(signal, targetAppId);
+      if (!owner)
+        return { kind: "unknown" };
+      if (owner === targetAppId)
+        return { kind: "target" };
+      if (isTransientMobileSystemOwner(owner, platform3)) {
+        return { kind: "transient_external", owner, targetAppId };
+      }
+      return { kind: "external", owner, targetAppId };
+    }
+    function isTargetLikeMobileBoundary2(boundary) {
+      return boundary.kind === "target" || boundary.kind === "unknown";
+    }
+    function mobileBoundaryNote(boundary) {
+      return [
+        "",
+        "## App Boundary",
+        `Foreground app is ${boundary.owner}, outside target app ${boundary.targetAppId}.`,
+        boundary.kind === "transient_external" ? "This looks like a system overlay. Handle or dismiss it if needed, but do not capture it as an app screen." : "The runner excluded this external app screen from the target app evidence and relaunched the target app."
+      ].join("\n");
+    }
+  }
+});
+
 // ../shared/dist/types.js
 function isUIVariant(value) {
   return typeof value === "string" && UI_VARIANTS.includes(value);
@@ -1477,6 +1536,18 @@ function buildAppiumCode(testName, target, steps) {
     `  }`,
     `  throw new Error('No locator resolved. Tried: ' + JSON.stringify(selectors) + (__lastError ? ' (last error: ' + String(__lastError) + ')' : ''));`,
     `}`,
+    ``,
+    `async function __tapAt(driver: WebdriverIO.Browser, x: number, y: number) {`,
+    `  await driver.performActions([{ type: 'pointer', id: 'finger1', parameters: { pointerType: 'touch' }, actions: [{ type: 'pointerMove', duration: 0, x, y }, { type: 'pointerDown', button: 0 }, { type: 'pause', duration: 100 }, { type: 'pointerUp', button: 0 }] }]);`,
+    `}`,
+    ``,
+    `async function __typeIntoFocused(driver: WebdriverIO.Browser, text: string) {`,
+    `  try {`,
+    `    await (await driver.getActiveElement() as unknown as WebdriverIO.Element).addValue(text);`,
+    `  } catch {`,
+    `    await driver.keys(text);`,
+    `  }`,
+    `}`,
     ...hasSwipe ? [
       ``,
       `// Read the device window with a few retries (matches the runtime executor).`,
@@ -1535,13 +1606,25 @@ function buildAppiumCode(testName, target, steps) {
       const y = Math.round(bounds.y + bounds.height / 2);
       lines.push(`    await driver.performActions([{ type: 'pointer', id: 'finger1', parameters: { pointerType: 'touch' }, actions: [{ type: 'pointerMove', duration: 0, x: ${x}, y: ${y} }, { type: 'pointerDown', button: 0 }, { type: 'pause', duration: 100 }, { type: 'pointerUp', button: 0 }] }]);`);
     } else if (step.action === "type" && hasSelector) {
-      lines.push(`    await (await findFirst(driver, ${candidatesLiteral})).addValue(${toJsStringLiteral(step.value ?? "")});`);
+      if (bounds) {
+        const x = Math.round(bounds.x + bounds.width / 2);
+        const y = Math.round(bounds.y + bounds.height / 2);
+        lines.push(`    try {`);
+        lines.push(`      await (await findFirst(driver, ${candidatesLiteral})).addValue(${toJsStringLiteral(step.value ?? "")});`);
+        lines.push(`    } catch {`);
+        lines.push(`      await __tapAt(driver, ${x}, ${y});`);
+        lines.push(`      await driver.pause(${MOBILE_FOCUS_SETTLE_MS});`);
+        lines.push(`      await __typeIntoFocused(driver, ${toJsStringLiteral(step.value ?? "")});`);
+        lines.push(`    }`);
+      } else {
+        lines.push(`    await (await findFirst(driver, ${candidatesLiteral})).addValue(${toJsStringLiteral(step.value ?? "")});`);
+      }
     } else if (step.action === "type" && bounds) {
       const x = Math.round(bounds.x + bounds.width / 2);
       const y = Math.round(bounds.y + bounds.height / 2);
-      lines.push(`    await driver.performActions([{ type: 'pointer', id: 'finger1', parameters: { pointerType: 'touch' }, actions: [{ type: 'pointerMove', duration: 0, x: ${x}, y: ${y} }, { type: 'pointerDown', button: 0 }, { type: 'pause', duration: 100 }, { type: 'pointerUp', button: 0 }] }]);`);
+      lines.push(`    await __tapAt(driver, ${x}, ${y});`);
       lines.push(`    await driver.pause(${MOBILE_FOCUS_SETTLE_MS});`);
-      lines.push(`    await (await driver.getActiveElement() as unknown as WebdriverIO.Element).addValue(${toJsStringLiteral(step.value ?? "")});`);
+      lines.push(`    await __typeIntoFocused(driver, ${toJsStringLiteral(step.value ?? "")});`);
     } else if (step.action === "clear" && hasSelector) {
       lines.push(`    await (await findFirst(driver, ${candidatesLiteral})).clearValue();`);
     } else if (step.action === "assertVisible" && hasSelector) {
@@ -4438,21 +4521,13 @@ var require_mobile_explorer = __commonJS({
     var ai_retry_js_1 = require_ai_retry();
     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 MAX_MOBILE_ITERATIONS_SURVEY = 40;
     var MAX_MOBILE_ITERATIONS_DEEP = 60;
     var MAX_SCREENSHOTS = 15;
     var MAX_RECENT_EXCHANGES = 24;
     var OBSERVATION_MAX_ELEMENTS = 50;
     var NO_SNAPSHOT_NUDGE_THRESHOLD = 4;
-    var ANDROID_TRANSIENT_SYSTEM_APP_IDS = /* @__PURE__ */ new Set([
-      "com.android.permissioncontroller",
-      "com.google.android.permissioncontroller",
-      "com.android.packageinstaller",
-      "com.google.android.packageinstaller"
-    ]);
-    var IOS_TRANSIENT_SYSTEM_APP_IDS = /* @__PURE__ */ new Set([
-      "com.apple.springboard"
-    ]);
     var MOBILE_SNAPSHOT_TOOL = {
       type: "function",
       function: {
@@ -4675,40 +4750,6 @@ var require_mobile_explorer = __commonJS({
         return "timeout";
       return "ai_error";
     }
-    function ownerFromScreenSignal(signal, targetAppId) {
-      const bundleId = signal.bundleId?.trim();
-      if (bundleId)
-        return bundleId;
-      const activity = signal.activity?.trim();
-      if (activity && targetAppId && (activity === targetAppId || activity.startsWith(`${targetAppId}.`))) {
-        return targetAppId;
-      }
-      return null;
-    }
-    function isTransientSystemOwner(owner, platform3) {
-      return platform3 === "ANDROID" ? ANDROID_TRANSIENT_SYSTEM_APP_IDS.has(owner) : IOS_TRANSIENT_SYSTEM_APP_IDS.has(owner);
-    }
-    function classifyMobileScreenBoundary(signal, targetAppId, platform3) {
-      if (!targetAppId)
-        return { kind: "target" };
-      const owner = ownerFromScreenSignal(signal, targetAppId);
-      if (!owner)
-        return { kind: "unknown" };
-      if (owner === targetAppId)
-        return { kind: "target" };
-      if (isTransientSystemOwner(owner, platform3)) {
-        return { kind: "transient_external", owner, targetAppId };
-      }
-      return { kind: "external", owner, targetAppId };
-    }
-    function boundaryNote(boundary) {
-      return [
-        "",
-        "## App Boundary",
-        `Foreground app is ${boundary.owner}, outside target app ${boundary.targetAppId}.`,
-        boundary.kind === "transient_external" ? "This looks like a system overlay. Handle or dismiss it if needed, but do not capture it as an app screen." : "The runner excluded this external app screen from the survey evidence."
-      ].join("\n");
-    }
     function resolveSnapshot(xml, windowSize, driverSignal, platform3) {
       const parsed = (0, mobile_source_parser_js_1.parseMobileSource)(xml, platform3);
       const signal = {
@@ -4906,10 +4947,10 @@ Use this to prioritize which screens and flows to cover.` : "";
       };
       const currentBoundary = () => {
         const current = getLatest();
-        return current ? classifyMobileScreenBoundary(current.signal, targetAppId, platform3) : { kind: "unknown" };
+        return current ? (0, mobile_boundary_js_1.classifyMobileScreenBoundary)(current.signal, targetAppId, platform3) : { kind: "unknown" };
       };
       const absorbResolvedObservation = async (resolved, screenshot, iterationForObservation, source) => {
-        const boundary = classifyMobileScreenBoundary(resolved.signal, targetAppId, platform3);
+        const boundary = (0, mobile_boundary_js_1.classifyMobileScreenBoundary)(resolved.signal, targetAppId, platform3);
         if (boundary.kind === "target" || boundary.kind === "unknown") {
           const screenId = ingestSnapshot(resolved, iterationForObservation);
           captureScreenshot(screenshot, screenId);
@@ -4920,7 +4961,7 @@ Use this to prioritize which screens and flows to cover.` : "";
         if (boundary.kind === "transient_external") {
           log2(`   System overlay detected from ${source}: ${boundary.owner}; not adding it to target-app survey evidence.`);
           return {
-            observation: `${resolved.observation}${boundaryNote(boundary)}`,
+            observation: `${resolved.observation}${(0, mobile_boundary_js_1.mobileBoundaryNote)(boundary)}`,
             screenId: null,
             transientExternal: true,
             externalOwner: boundary.owner
@@ -4939,7 +4980,7 @@ Use this to prioritize which screens and flows to cover.` : "";
               externalOwner: boundary.owner
             };
           }
-          const recoveredBoundary = classifyMobileScreenBoundary(recovered.signal, targetAppId, platform3);
+          const recoveredBoundary = (0, mobile_boundary_js_1.classifyMobileScreenBoundary)(recovered.signal, targetAppId, platform3);
           latest = recovered;
           lastSnapshotIteration = iterationForObservation;
           if (recoveredBoundary.kind === "target" || recoveredBoundary.kind === "unknown") {
@@ -4955,7 +4996,7 @@ Use this to prioritize which screens and flows to cover.` : "";
           if (recoveredBoundary.kind === "transient_external") {
             log2(`   Relaunch surfaced system overlay ${recoveredBoundary.owner}; not adding it to target-app survey evidence.`);
             return {
-              observation: `${recovered.observation}${boundaryNote(recoveredBoundary)}`,
+              observation: `${recovered.observation}${(0, mobile_boundary_js_1.mobileBoundaryNote)(recoveredBoundary)}`,
               screenId: null,
               externalBlocked: true,
               transientExternal: true,
@@ -8599,6 +8640,7 @@ var require_mobile_generator = __commonJS({
     var mobile_source_parser_js_1 = require_mobile_source_parser();
     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 MAX_SCENARIO_ITERATIONS = 30;
     var MAX_RECENT_EXCHANGES = 24;
     var OBSERVATION_MAX_ELEMENTS = 50;
@@ -8784,8 +8826,9 @@ var require_mobile_generator = __commonJS({
     function hasStableId(element) {
       return !!nonEmpty2(element.accessibilityId) || !!nonEmpty2(element.resourceId);
     }
-    function buildSystemPrompt(platform3) {
+    function buildSystemPrompt(platform3, targetAppId) {
       const platformLabel = platform3 === "IOS" ? "iOS" : "Android";
+      const targetLine = targetAppId ? ` Target app package/bundle: ${targetAppId}.` : "";
       return `You are an expert mobile QA agent generating ONE automated test by driving a real ${platformLabel} app on a connected device. The app has just been relaunched into a clean state.
 
 ## How the loop works
@@ -8805,7 +8848,8 @@ var require_mobile_generator = __commonJS({
 - Re-snapshot before every assertion so the ref is fresh.
 - Assert the OUTCOME of the flow (the new screen / new content), not the control you just tapped.
 - Do NOT trigger irreversible side effects (real payments, sending messages to others) \u2014 note them and assert what you safely can.
-- Stay inside this app. Finish promptly once the outcome is proven.
+- Stay inside this app.${targetLine} Do not open or use app stores, browsers, email apps, settings, or any other app. If an action leaves the target app, the runner will relaunch the target app and reject that action.
+- Finish promptly once the outcome is proven.
 
 Max iterations: ${MAX_SCENARIO_ITERATIONS}. You will be warned near the end.`;
     }
@@ -8878,7 +8922,7 @@ Start by calling mobile_snapshot, then execute the steps. Finish with at least o
       }
     }
     async function runScenarioLoop(args) {
-      const { scenario, driver, platform: platform3, maxIterations, agentModel, provider, aiClient, auditGroupId, onAICall, log: log2 } = args;
+      const { scenario, driver, platform: platform3, maxIterations, agentModel, provider, aiClient, auditGroupId, onAICall, onScreenshot, targetAppId, log: log2 } = args;
       const actions = [];
       let assertCount = 0;
       let finish = null;
@@ -8892,14 +8936,98 @@ Start by calling mobile_snapshot, then execute the steps. Finish with at least o
         const fromActivity = signal.activity ? signal.activity.split(".").pop() : void 0;
         return nonEmpty2(fromActivity) ?? nonEmpty2(signal.bundleId) ?? `screen-${signal.screenHash.slice(0, 8)}`;
       };
-      const ingest = (xml, driverSignal, windowSize) => {
-        if (!xml)
-          return null;
-        const resolved = resolveSnapshot(xml, windowSize ?? latest?.screen.windowSize ?? null, driverSignal, platform3);
+      const setLatest = (resolved) => {
         latest = resolved;
         lastScreenName = screenNameFor(resolved);
         return resolved;
       };
+      const buildResolved = (xml, driverSignal, windowSize) => {
+        if (!xml)
+          return null;
+        return resolveSnapshot(xml, windowSize ?? latest?.screen.windowSize ?? null, driverSignal, platform3);
+      };
+      const emitScreenshot = (base64) => {
+        if (!base64)
+          return;
+        try {
+          onScreenshot?.(base64);
+        } catch {
+        }
+      };
+      const absorbResolvedObservation = async (resolved, screenshot, source) => {
+        const boundary = (0, mobile_boundary_js_1.classifyMobileScreenBoundary)(resolved.signal, targetAppId, platform3);
+        if ((0, mobile_boundary_js_1.isTargetLikeMobileBoundary)(boundary)) {
+          setLatest(resolved);
+          emitScreenshot(screenshot);
+          return { resolved, observation: resolved.observation };
+        }
+        setLatest(resolved);
+        if (boundary.kind === "transient_external") {
+          log2(`  system overlay detected from ${source}: ${boundary.owner}; not recording it as a target-app step.`);
+          return {
+            resolved,
+            observation: `${resolved.observation}${(0, mobile_boundary_js_1.mobileBoundaryNote)(boundary)}`,
+            transientExternal: true,
+            externalOwner: boundary.owner
+          };
+        }
+        log2(`  external app detected from ${source}: ${boundary.owner}; rejecting the action and relaunching ${boundary.targetAppId}.`);
+        try {
+          await driver.relaunch();
+          const snap = await driver.snapshot();
+          const recovered = buildResolved(snap.xml, snap.screenSignal, snap.windowSize);
+          if (!recovered) {
+            return {
+              resolved: null,
+              observation: `(left target app ${boundary.targetAppId} for ${boundary.owner}; relaunched target app, but no UI tree was returned)`,
+              externalBlocked: true,
+              externalOwner: boundary.owner
+            };
+          }
+          const recoveredBoundary = (0, mobile_boundary_js_1.classifyMobileScreenBoundary)(recovered.signal, targetAppId, platform3);
+          setLatest(recovered);
+          if ((0, mobile_boundary_js_1.isTargetLikeMobileBoundary)(recoveredBoundary)) {
+            emitScreenshot(snap.screenshot);
+            return {
+              resolved: recovered,
+              observation: recovered.observation,
+              externalBlocked: true,
+              externalOwner: boundary.owner
+            };
+          }
+          if (recoveredBoundary.kind === "transient_external") {
+            log2(`  relaunch surfaced system overlay ${recoveredBoundary.owner}; not recording it as a target-app step.`);
+            return {
+              resolved: recovered,
+              observation: `${recovered.observation}${(0, mobile_boundary_js_1.mobileBoundaryNote)(recoveredBoundary)}`,
+              externalBlocked: true,
+              transientExternal: true,
+              externalOwner: boundary.owner
+            };
+          }
+          log2(`  relaunch still outside target app (${recoveredBoundary.owner}); 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)`,
+            externalBlocked: true,
+            externalOwner: boundary.owner
+          };
+        } catch (err) {
+          const message = err instanceof Error ? err.message : String(err);
+          return {
+            resolved: null,
+            observation: `(left target app ${boundary.targetAppId} for ${boundary.owner}; failed to relaunch target app: ${message})`,
+            externalBlocked: true,
+            externalOwner: boundary.owner
+          };
+        }
+      };
+      const absorbObservation = async (xml, driverSignal, windowSize, screenshot, source) => {
+        const resolved = buildResolved(xml, driverSignal, windowSize);
+        if (!resolved)
+          return { resolved: null, observation: null };
+        return absorbResolvedObservation(resolved, screenshot, source);
+      };
       const resolveRef = (ref) => {
         if (typeof ref !== "string" || !latest)
           return null;
@@ -8907,11 +9035,11 @@ Start by calling mobile_snapshot, then execute the steps. Finish with at least o
       };
       try {
         const seed = await driver.snapshot();
-        ingest(seed.xml, seed.screenSignal, seed.windowSize);
+        await absorbObservation(seed.xml, seed.screenSignal, seed.windowSize, seed.screenshot, "seed snapshot");
       } catch (err) {
         log2(`  seed snapshot failed (non-fatal): ${err instanceof Error ? err.message : String(err)}`);
       }
-      const systemPrompt = buildSystemPrompt(platform3);
+      const systemPrompt = buildSystemPrompt(platform3, targetAppId);
       const kickoff = buildScenarioKickoff(scenario);
       const recentExchanges = [];
       let iteration = 0;
@@ -9022,7 +9150,7 @@ ${statePacket}` },
               driver,
               platform: platform3,
               latest: getLatest,
-              ingest,
+              absorbObservation,
               resolveRef,
               screenName: () => lastScreenName || "UnknownScreen",
               recordAction: (action) => {
@@ -9045,60 +9173,85 @@ ${statePacket}` },
       return { actions, assertCount, finish, lastSnapshot: getLatest(), lastScreenName };
     }
     async function dispatchGenerateTool(args) {
-      const { toolName, toolArgs, driver, platform: platform3, latest, ingest, resolveRef, screenName, recordAction, log: log2 } = args;
+      const { toolName, toolArgs, driver, platform: platform3, latest, absorbObservation, resolveRef, screenName, recordAction, log: log2 } = args;
       const unknownRef = (ref) => ({
         ok: false,
         error: `Unknown element ref "${String(ref)}". Call mobile_snapshot first; refs are only valid for the latest snapshot.`
       });
+      const actionPayload = (result, absorbed) => {
+        const blocked = Boolean(absorbed.externalBlocked || absorbed.transientExternal);
+        return {
+          ok: result.ok && !blocked,
+          ...result.error ? { error: result.error } : {},
+          ...blocked ? { error: "Action left the target app and was not recorded. Continue from the relaunched target app." } : {},
+          observation: absorbed.observation ?? void 0,
+          ...absorbed.externalBlocked ? { blockedExternalApp: true, externalApp: absorbed.externalOwner } : {},
+          ...absorbed.transientExternal ? { transientExternalApp: true, externalApp: absorbed.externalOwner } : {}
+        };
+      };
+      const shouldRecordAction = (result, absorbed) => result.ok && !absorbed.externalBlocked && !absorbed.transientExternal;
       switch (toolName) {
         case "mobile_snapshot": {
           const snap = await driver.snapshot();
-          const resolved = ingest(snap.xml, snap.screenSignal, snap.windowSize);
-          if (!resolved)
+          const absorbed = await absorbObservation(snap.xml, snap.screenSignal, snap.windowSize, snap.screenshot, "mobile_snapshot");
+          if (!absorbed.resolved)
             return { ok: false, error: "snapshot returned no UI tree" };
-          log2(`  snapshot: ${resolved.screen.elements.length} elements`);
-          return { observation: resolved.observation };
+          log2(`  snapshot: ${absorbed.resolved.screen.elements.length} elements`);
+          return {
+            observation: absorbed.observation,
+            ...absorbed.externalBlocked ? { blockedExternalApp: true, externalApp: absorbed.externalOwner } : {},
+            ...absorbed.transientExternal ? { transientExternalApp: true, externalApp: absorbed.externalOwner } : {}
+          };
         }
         case "mobile_tap": {
           const element = resolveRef(toolArgs.ref);
           if (!element)
             return unknownRef(toolArgs.ref);
+          const beforeScreenName = screenName();
           const result = await driver.tap(element.bounds);
-          recordAction({
-            type: "TAP",
-            selector: (0, mobile_source_parser_js_2.preferredLocator)(element),
-            metadata: metadataForElement(element, screenName(), platform3)
-          });
-          const resolved = ingest(result.source, void 0, latest()?.screen.windowSize ?? null);
-          return { ok: result.ok, ...result.error ? { error: result.error } : {}, observation: resolved?.observation };
+          const absorbed = await absorbObservation(result.source, result.screenSignal, latest()?.screen.windowSize ?? null, result.screenshot, "mobile_tap");
+          if (shouldRecordAction(result, absorbed)) {
+            recordAction({
+              type: "TAP",
+              selector: (0, mobile_source_parser_js_2.preferredLocator)(element),
+              metadata: metadataForElement(element, beforeScreenName, platform3)
+            });
+          }
+          return actionPayload(result, absorbed);
         }
         case "mobile_type": {
           const element = resolveRef(toolArgs.ref);
           if (!element)
             return unknownRef(toolArgs.ref);
           const value = typeof toolArgs.value === "string" ? toolArgs.value : String(toolArgs.value ?? "");
+          const beforeScreenName = screenName();
           const result = await driver.type(value, element.bounds);
-          recordAction({
-            type: "TYPE",
-            value,
-            selector: (0, mobile_source_parser_js_2.preferredLocator)(element),
-            metadata: metadataForElement(element, screenName(), platform3)
-          });
-          const resolved = ingest(result.source, void 0, latest()?.screen.windowSize ?? null);
-          return { ok: result.ok, ...result.error ? { error: result.error } : {}, observation: resolved?.observation };
+          const absorbed = await absorbObservation(result.source, result.screenSignal, latest()?.screen.windowSize ?? null, result.screenshot, "mobile_type");
+          if (shouldRecordAction(result, absorbed)) {
+            recordAction({
+              type: "TYPE",
+              value,
+              selector: (0, mobile_source_parser_js_2.preferredLocator)(element),
+              metadata: metadataForElement(element, beforeScreenName, platform3)
+            });
+          }
+          return actionPayload(result, absorbed);
         }
         case "mobile_clear": {
           const element = resolveRef(toolArgs.ref);
           if (!element)
             return unknownRef(toolArgs.ref);
+          const beforeScreenName = screenName();
           const result = await driver.clear(element.bounds);
-          recordAction({
-            type: "CLEAR",
-            selector: (0, mobile_source_parser_js_2.preferredLocator)(element),
-            metadata: metadataForElement(element, screenName(), platform3)
-          });
-          const resolved = ingest(result.source, void 0, latest()?.screen.windowSize ?? null);
-          return { ok: result.ok, ...result.error ? { error: result.error } : {}, observation: resolved?.observation };
+          const absorbed = await absorbObservation(result.source, result.screenSignal, latest()?.screen.windowSize ?? null, result.screenshot, "mobile_clear");
+          if (shouldRecordAction(result, absorbed)) {
+            recordAction({
+              type: "CLEAR",
+              selector: (0, mobile_source_parser_js_2.preferredLocator)(element),
+              metadata: metadataForElement(element, beforeScreenName, platform3)
+            });
+          }
+          return actionPayload(result, absorbed);
         }
         case "mobile_swipe": {
           const direction = toolArgs.direction;
@@ -9106,30 +9259,42 @@ ${statePacket}` },
             return { ok: false, error: "direction must be one of up|down|left|right" };
           }
           const distance = typeof toolArgs.distance === "number" ? toolArgs.distance : void 0;
+          const beforeScreenName = screenName();
           const result = await driver.swipe(direction, distance);
-          recordAction({
-            type: "SWIPE",
-            metadata: {
-              screenName: screenName(),
-              direction,
-              ...distance !== void 0 ? { distance } : {}
-            }
-          });
-          const resolved = ingest(result.source, void 0, latest()?.screen.windowSize ?? null);
-          return { ok: result.ok, ...result.error ? { error: result.error } : {}, observation: resolved?.observation };
+          const absorbed = await absorbObservation(result.source, result.screenSignal, latest()?.screen.windowSize ?? null, result.screenshot, "mobile_swipe");
+          if (shouldRecordAction(result, absorbed)) {
+            recordAction({
+              type: "SWIPE",
+              metadata: {
+                screenName: beforeScreenName,
+                direction,
+                ...distance !== void 0 ? { distance } : {}
+              }
+            });
+          }
+          return actionPayload(result, absorbed);
         }
         case "mobile_back": {
+          const beforeScreenName = screenName();
           const result = await driver.back();
-          recordAction({ type: "BACK", metadata: { screenName: screenName() } });
-          const resolved = ingest(result.source, void 0, latest()?.screen.windowSize ?? null);
-          return { ok: result.ok, ...result.error ? { error: result.error } : {}, observation: resolved?.observation };
+          const absorbed = await absorbObservation(result.source, result.screenSignal, latest()?.screen.windowSize ?? null, result.screenshot, "mobile_back");
+          if (shouldRecordAction(result, absorbed)) {
+            recordAction({ type: "BACK", metadata: { screenName: beforeScreenName } });
+          }
+          return actionPayload(result, absorbed);
         }
         case "mobile_relaunch": {
           await driver.relaunch();
           const snap = await driver.snapshot();
-          const resolved = ingest(snap.xml, snap.screenSignal, snap.windowSize);
+          const absorbed = await absorbObservation(snap.xml, snap.screenSignal, snap.windowSize, snap.screenshot, "mobile_relaunch");
           log2("  relaunched app for hermetic reset.");
-          return { ok: true, observation: resolved?.observation, note: "App relaunched (clean state). Not recorded as a step." };
+          return {
+            ok: true,
+            observation: absorbed.observation,
+            ...absorbed.externalBlocked ? { blockedExternalApp: true, externalApp: absorbed.externalOwner } : {},
+            ...absorbed.transientExternal ? { transientExternalApp: true, externalApp: absorbed.externalOwner } : {},
+            note: "App relaunched (clean state). Not recorded as a step."
+          };
         }
         case "mobile_assert_visible": {
           const recorded = recordAssertVisible(toolArgs, { resolveRef, screenName, platform: platform3, recordAction });
@@ -9267,7 +9432,7 @@ ${statePacket}` },
       return test;
     }
     async function runMobileGeneratePhase(args) {
-      const { scenarios, driver, ctx, config, onLog, onAICall, onTestGenerated } = args;
+      const { scenarios, driver, ctx, config, onLog, onAICall, onTestGenerated, onScreenshot } = args;
       const log2 = (line) => {
         try {
           onLog?.(line);
@@ -9281,6 +9446,7 @@ ${statePacket}` },
       const provider = (0, ai_provider_js_1.getProviderForModel)(agentModel);
       const aiClient = modelOverride ? (0, ai_provider_js_1.getMobileClientForModel)(modelOverride) : (0, ai_provider_js_1.getMobileAIClient)();
       const auditGroupId = `mobile-generate-${(0, crypto_1.randomUUID)().slice(0, 8)}`;
+      const targetAppId = ctx.target?.appId?.trim() || void 0;
       log2(`Mobile generator starting \u2014 platform: ${platform3}, provider: ${provider}, model: ${agentModel}, scenarios: ${scenarios.length}`);
       const tests = [];
       for (let i = 0; i < scenarios.length; i++) {
@@ -9299,6 +9465,8 @@ ${statePacket}` },
             aiClient,
             auditGroupId,
             onAICall,
+            onScreenshot,
+            targetAppId,
             log: log2
           });
           const test = assembleTest({ scenario, recording, ctx, platform: platform3, log: log2 });
@@ -311428,7 +311596,9 @@ var require_mobile_discovery_agent = __commonJS({
       return {
         collectedPages: explore.collectedPages,
         collectedTransitions,
-        pageScreenshots: explore.pageScreenshots,
+        // Native screenshots are multi-megabyte PNGs. The live mirror streams them
+        // through heartbeat telemetry; discovery checkpoints keep the screen graph
+        // and transitions so large Android surveys cannot exceed server body limits.
         exploreStats: explore.exploreStats,
         healthObservations: explore.healthObservations
       };
@@ -311586,6 +311756,7 @@ Plan: ${planResult.scenarios.length} scenarios, ${planResult.featureGroups.lengt
           ctx,
           onLog: (line) => log2(line),
           onAICall,
+          onScreenshot,
           onTestGenerated: (test) => callbacks?.onTestGenerated?.(test, { phase: "verified" })
         });
         const generateElapsed = ((Date.now() - startTime) / 1e3).toFixed(1);
@@ -325291,7 +325462,7 @@ var require_live_browser_registry = __commonJS({
     var THUMBNAIL_INTERVAL_MS = parseInt(process.env.LIVE_BROWSER_THUMBNAIL_INTERVAL_MS ?? "4000", 10) || 4e3;
     var THUMBNAIL_QUALITY = parseInt(process.env.LIVE_BROWSER_THUMBNAIL_QUALITY ?? "60", 10) || 60;
     var BROWSER_THUMBNAIL_MAX_BASE64_BYTES = parseInt(process.env.LIVE_BROWSER_THUMBNAIL_MAX_BASE64_BYTES ?? "400000", 10) || 4e5;
-    var MOBILE_THUMBNAIL_MAX_BASE64_BYTES = parseInt(process.env.LIVE_MOBILE_THUMBNAIL_MAX_BASE64_BYTES ?? "2000000", 10) || 2e6;
+    var MOBILE_THUMBNAIL_MAX_BASE64_BYTES = parseInt(process.env.LIVE_MOBILE_THUMBNAIL_MAX_BASE64_BYTES ?? "4500000", 10) || 45e5;
     var STALE_SESSION_MS = parseInt(process.env.LIVE_BROWSER_STALE_MS ?? `${10 * 60 * 1e3}`, 10) || 10 * 60 * 1e3;
     var MAX_SESSIONS = parseInt(process.env.LIVE_BROWSER_MAX_SESSIONS ?? "32", 10) || 32;
     var LiveBrowserRegistry = class {
@@ -325787,6 +325958,7 @@ var require_dist2 = __commonJS({
     __exportStar(require_ai_provider(), exports);
     __exportStar(require_mobile_types(), exports);
     __exportStar(require_mobile_source_parser(), exports);
+    __exportStar(require_mobile_boundary(), exports);
     var mobile_explorer_js_1 = require_mobile_explorer();
     Object.defineProperty(exports, "runMobileExplorePhase", { enumerable: true, get: function() {
       return mobile_explorer_js_1.runMobileExplorePhase;
@@ -326119,7 +326291,7 @@ var require_package4 = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@validate.qa/runner",
-      version: "1.0.5",
+      version: "1.0.6",
       description: "validate local test runner - execute Playwright tests on your machine, connected to validate.qa cloud.",
       bin: {
         "validate-runner": "dist/cli.js"
@@ -326217,7 +326389,7 @@ var import_runner_core = __toESM(require_dist2());
 var import_runner_core2 = __toESM(require_dist2());
 
 // src/runner.ts
-var import_runner_core9 = __toESM(require_dist2());
+var import_runner_core10 = __toESM(require_dist2());
 
 // src/services/regression-runner.ts
 var import_runner_core3 = __toESM(require_dist2());
@@ -326232,7 +326404,7 @@ var import_runner_core5 = __toESM(require_dist2());
 var import_runner_core6 = __toESM(require_dist2());
 
 // src/runner.ts
-var import_runner_core10 = __toESM(require_dist2());
+var import_runner_core11 = __toESM(require_dist2());
 
 // src/services/auth-state.ts
 var INLINE_LOGIN_TAG = "@inline-login";
@@ -326252,6 +326424,7 @@ function shouldUseAuthState(tags, playwrightCode) {
 
 // src/services/appium-executor.ts
 init_dist();
+var import_runner_core8 = __toESM(require_dist2());
 
 // src/services/appium-lifecycle.ts
 import { spawn, execFileSync } from "child_process";
@@ -327543,6 +327716,86 @@ async function openDeepLink(sessionId, platform3, deeplink, appId) {
     body: JSON.stringify({ script: "mobile: deepLink", args })
   });
 }
+function readExecuteStringValue(result) {
+  if (result && typeof result === "object" && "value" in result) {
+    const value = result.value;
+    if (typeof value === "string" && value.trim()) return value.trim();
+  }
+  return void 0;
+}
+function readActiveBundleId(result) {
+  if (result && typeof result === "object" && "value" in result) {
+    const value = result.value;
+    if (value && typeof value === "object" && "bundleId" in value) {
+      const bundleId = value.bundleId;
+      if (typeof bundleId === "string" && bundleId.trim()) return bundleId.trim();
+    }
+  }
+  return void 0;
+}
+function normalizeAndroidActivity(activity, pkg2) {
+  const trimmed = activity?.trim();
+  if (!trimmed) return void 0;
+  const packageName = pkg2?.trim();
+  if (!packageName) return trimmed;
+  if (trimmed.startsWith(".")) return `${packageName}${trimmed}`;
+  if (!trimmed.includes(".")) return `${packageName}.${trimmed}`;
+  return trimmed;
+}
+async function executeMobileScript(sessionId, script, args) {
+  return wdRequest(`/session/${sessionId}/execute/sync`, {
+    method: "POST",
+    body: JSON.stringify({ script, args })
+  });
+}
+async function readForegroundScreenSignal(sessionId, platform3) {
+  if (platform3 === "ANDROID") {
+    const [packageResult, activityResult] = await Promise.all([
+      executeMobileScript(sessionId, "mobile: getCurrentPackage", []),
+      executeMobileScript(sessionId, "mobile: getCurrentActivity", []).catch(() => void 0)
+    ]);
+    const pkg2 = readExecuteStringValue(packageResult);
+    if (!pkg2) return null;
+    const activity = normalizeAndroidActivity(readExecuteStringValue(activityResult), pkg2);
+    return {
+      platform: platform3,
+      bundleId: pkg2,
+      ...activity ? { activity } : {},
+      screenHash: "foreground"
+    };
+  }
+  const infoResult = await executeMobileScript(sessionId, "mobile: activeAppInfo", []);
+  const bundleId = readActiveBundleId(infoResult);
+  if (!bundleId) return null;
+  return { platform: platform3, bundleId, screenHash: "foreground" };
+}
+async function activateTargetApp(sessionId, platform3, appId) {
+  const args = platform3 === "IOS" ? [{ bundleId: appId }] : [{ appId }];
+  await executeMobileScript(sessionId, "mobile: activateApp", args);
+}
+async function restoreTargetAppIfExternal(sessionId, target, log2, source, failOnExternal) {
+  let boundary = null;
+  try {
+    const signal = await readForegroundScreenSignal(sessionId, target.platform);
+    boundary = signal ? (0, import_runner_core8.classifyMobileScreenBoundary)(signal, target.appId, target.platform) : null;
+  } catch (err) {
+    log2(`  App boundary check skipped after ${source}: ${err instanceof Error ? err.message : String(err)}`);
+    return;
+  }
+  if (!boundary || (0, import_runner_core8.isTargetLikeMobileBoundary)(boundary) || boundary.kind === "transient_external") {
+    return;
+  }
+  const message = `Foreground app changed to ${boundary.owner}, outside target app ${boundary.targetAppId}`;
+  log2(`  ${message}; activating target app.`);
+  try {
+    await activateTargetApp(sessionId, target.platform, target.appId);
+  } catch (err) {
+    log2(`  Could not reactivate ${target.appId}: ${err instanceof Error ? err.message : String(err)}`);
+  }
+  if (failOnExternal) {
+    throw new Error(`${message}; relaunched target app and failed the step so mobile tests do not continue in another app.`);
+  }
+}
 async function deleteSession(sessionId) {
   try {
     await wdRequest(`/session/${sessionId}`, { method: "DELETE" });
@@ -327669,6 +327922,29 @@ async function getActiveElementId(sessionId) {
     return null;
   }
 }
+async function sendKeysToFocusedInput(sessionId, value) {
+  await wdRequest(`/session/${sessionId}/keys`, {
+    method: "POST",
+    body: JSON.stringify({ text: value, value: Array.from(value) })
+  });
+}
+function shouldAbortAfterStepFailure(action) {
+  switch (action) {
+    case "launchApp":
+    case "tap":
+    case "type":
+    case "clear":
+    case "swipe":
+    case "scroll":
+    case "back":
+    case "home":
+    case "waitForElement":
+      return true;
+    case "assertVisible":
+    case "assertText":
+      return false;
+  }
+}
 async function executeTap(sessionId, step) {
   const bounds = boundsFromStep(step);
   if (step.target) {
@@ -327690,8 +327966,10 @@ async function executeTap(sessionId, step) {
 }
 async function executeType(sessionId, step) {
   if (step.value === void 0 || step.value === null || step.value === "") return;
+  const value = String(step.value);
   const bounds = boundsFromStep(step);
   let elementId = null;
+  let tappedBounds = false;
   if (step.target) {
     try {
       elementId = await findElement(sessionId, step.target, readStepTimeout(step));
@@ -327701,19 +327979,33 @@ async function executeType(sessionId, step) {
   }
   if (!elementId && bounds) {
     await tapCoordinates(sessionId, bounds);
+    tappedBounds = true;
     await new Promise((resolve) => setTimeout(resolve, MOBILE_FOCUS_SETTLE_MS));
     elementId = await getActiveElementId(sessionId);
   }
   if (!elementId) {
     elementId = await getActiveElementId(sessionId);
   }
-  if (!elementId) {
-    throw new Error("TYPE step could not resolve a target or focused element");
+  if (elementId) {
+    try {
+      await wdRequest(`/session/${sessionId}/element/${elementId}/value`, {
+        method: "POST",
+        body: JSON.stringify({ text: value })
+      });
+      return;
+    } catch (error2) {
+      if (!bounds) throw error2;
+    }
   }
-  await wdRequest(`/session/${sessionId}/element/${elementId}/value`, {
-    method: "POST",
-    body: JSON.stringify({ text: step.value })
-  });
+  if (bounds) {
+    if (!tappedBounds) {
+      await tapCoordinates(sessionId, bounds);
+      await new Promise((resolve) => setTimeout(resolve, MOBILE_FOCUS_SETTLE_MS));
+    }
+    await sendKeysToFocusedInput(sessionId, value);
+    return;
+  }
+  throw new Error("TYPE step could not resolve a target or focused element");
 }
 async function executeClear(sessionId, step) {
   const bounds = boundsFromStep(step);
@@ -327917,6 +328209,7 @@ async function executeMobileTest(options) {
         log2(`  \u2717 Deep link failed: ${err instanceof Error ? err.message : String(err)}`);
       }
     }
+    await restoreTargetAppIfExternal(sessionId, options.target, log2, "session start", false);
     let environmental = null;
     for (const step of options.steps) {
       const stepStart = Date.now();
@@ -327924,6 +328217,7 @@ async function executeMobileTest(options) {
       let status = "passed";
       let stepError;
       try {
+        await restoreTargetAppIfExternal(sessionId, options.target, log2, `step ${step.order} pre-check`, false);
         switch (step.action) {
           case "launchApp":
             log2("  App launched (handled by session creation)");
@@ -327963,6 +328257,7 @@ async function executeMobileTest(options) {
             break;
           }
         }
+        await restoreTargetAppIfExternal(sessionId, options.target, log2, `step ${step.order} (${step.action})`, true);
       } catch (err) {
         status = "failed";
         stepError = err instanceof Error ? err.message : String(err);
@@ -327983,6 +328278,10 @@ async function executeMobileTest(options) {
         log2(`Aborting remaining steps \u2014 Appium session is no longer usable: ${environmental}`);
         break;
       }
+      if (status === "failed" && shouldAbortAfterStepFailure(step.action)) {
+        log2(`Aborting remaining steps \u2014 ${step.action} failed, so downstream mobile steps are no longer reliable.`);
+        break;
+      }
     }
     const allPassed = !environmental && stepResults.every((r) => r.status === "passed" || r.status === "skipped");
     const firstError = environmental ?? (stepResults.find((r) => r.status === "failed")?.error ?? null);
@@ -329248,7 +329547,7 @@ function detachMirrorSession(sessionId) {
 }
 
 // src/services/mobile/mobile-bridge-driver.ts
-var import_runner_core8 = __toESM(require_dist2());
+var import_runner_core9 = __toESM(require_dist2());
 init_dist();
 var APPIUM_SESSION_ID_PATTERN2 = /^[a-f0-9-]{1,64}$/i;
 function readStringValue(result) {
@@ -329258,7 +329557,7 @@ function readStringValue(result) {
   }
   return void 0;
 }
-function normalizeAndroidActivity(activity, pkg2) {
+function normalizeAndroidActivity2(activity, pkg2) {
   const trimmed = activity?.trim();
   if (!trimmed) return void 0;
   const packageName = pkg2?.trim();
@@ -329294,7 +329593,7 @@ var MobileBridgeDriver = class {
     return this.platform === "ANDROID" ? { appId: this.appId } : { bundleId: this.appId };
   }
   baseScreenSignal(source) {
-    const parsed = (0, import_runner_core8.parseMobileSource)(source, this.platform);
+    const parsed = (0, import_runner_core9.parseMobileSource)(source, this.platform);
     return {
       platform: this.platform,
       screenHash: parsed.screenSignal.screenHash,
@@ -329313,11 +329612,11 @@ var MobileBridgeDriver = class {
         const activity = readStringValue(activityRes);
         const pkg2 = readStringValue(packageRes);
         if (pkg2) signal.bundleId = pkg2;
-        const normalizedActivity = normalizeAndroidActivity(activity, pkg2);
+        const normalizedActivity = normalizeAndroidActivity2(activity, pkg2);
         if (normalizedActivity) signal.activity = normalizedActivity;
       } else {
         const infoRes = await this.executeScript("mobile: activeAppInfo", []).catch(() => void 0);
-        const bundleId = readActiveBundleId(infoRes);
+        const bundleId = readActiveBundleId2(infoRes);
         if (bundleId) signal.bundleId = bundleId;
       }
     } catch {
@@ -329459,7 +329758,7 @@ var MobileBridgeDriver = class {
     return this.enrichScreenSignal(source);
   }
 };
-function readActiveBundleId(result) {
+function readActiveBundleId2(result) {
   if (result && typeof result === "object" && "value" in result) {
     const value = result.value;
     if (value && typeof value === "object" && "bundleId" in value) {
@@ -329685,7 +329984,7 @@ function printDoctorReport(report) {
 
 // src/runner.ts
 init_dist();
-var import_runner_core11 = __toESM(require_dist2());
+var import_runner_core12 = __toESM(require_dist2());
 function fingerprintTest(test) {
   const code = test.framework === "APPIUM" ? [test.appiumCode ?? "", JSON.stringify(test.steps ?? [])].join("\n--steps--\n") : test.playwrightCode ?? "";
   return createHash("sha256").update(test.name).update("\n--suite--\n").update(test.suiteName ?? "").update("\n--type--\n").update(test.testType ?? "").update("\n--framework--\n").update(test.framework ?? "").update("\n--code--\n").update(code).digest("hex").slice(0, 24);
@@ -330130,7 +330429,7 @@ function pruneCollectedPageForPost(page) {
   if (Array.isArray(out.observations)) out.observations = out.observations.slice(-200).map((obs) => compactForAudit(obs));
   return out;
 }
-function prepareDiscoveryResultForPost(result, logs2) {
+function prepareDiscoveryResultForPost(result, logs2, options = {}) {
   const safe = { ...result, logs: truncateTextTail(logs2, RESULT_LOG_MAX_CHARS, "discovery result log") };
   if (Array.isArray(safe.collectedPages)) safe.collectedPages = safe.collectedPages.map(pruneCollectedPageForPost);
   if (Array.isArray(safe.apiCalls)) safe.apiCalls = safe.apiCalls.map((call) => compactForAudit(call));
@@ -330146,6 +330445,10 @@ function prepareDiscoveryResultForPost(result, logs2) {
   if (safe.snapshotEvidence) safe.snapshotEvidence = compactForAudit(safe.snapshotEvidence);
   if (safe.discoveryCheckpoints) safe.discoveryCheckpoints = compactForAudit(safe.discoveryCheckpoints);
   if (safe.pageScreenshotKeys && safe.pageScreenshots) delete safe.pageScreenshots;
+  if (options.omitScreenshots) {
+    if (Array.isArray(safe.screenshots)) delete safe.screenshots;
+    if (safe.pageScreenshots) delete safe.pageScreenshots;
+  }
   if (safe.exploreAlreadySaved === true) {
     if (Array.isArray(safe.screenshots)) delete safe.screenshots;
     if (safe.pageScreenshots) delete safe.pageScreenshots;
@@ -330245,7 +330548,7 @@ async function executeRun(run2, opts, headers, requestLiveBrowserHeartbeat = ()
   const runMode = run2.mode ?? "run";
   const RUNNER_MODE = opts.runnerMode ?? "playwright-native";
   log.info(`Running test: ${run2.testCaseId ?? "auth-setup"} (run ${run2.runId}) [mode: ${runMode === "heal" ? "heal" : runMode === "auth-setup" ? "auth-setup" : RUNNER_MODE}]`);
-  const liveBrowserHandle = import_runner_core10.liveBrowserRegistry.register({
+  const liveBrowserHandle = import_runner_core11.liveBrowserRegistry.register({
     sessionId: `${run2.runId}`,
     mode: toLiveBrowserMode(runMode),
     runId: run2.runId,
@@ -330254,7 +330557,10 @@ async function executeRun(run2, opts, headers, requestLiveBrowserHeartbeat = ()
     testCaseId: run2.testCaseId ?? void 0
   });
   requestLiveBrowserHeartbeat(true);
-  const liveBrowserHeartbeatInterval = setInterval(() => requestLiveBrowserHeartbeat(), 5e3);
+  const liveBrowserHeartbeatInterval = setInterval(() => {
+    liveBrowserHandle.patch({});
+    requestLiveBrowserHeartbeat();
+  }, 5e3);
   liveBrowserHeartbeatInterval.unref?.();
   const runNativeWithLiveBrowser = (nativeOptions) => (0, import_runner_core.executeTestViaNativePlaywright)({
     ...nativeOptions,
@@ -330281,7 +330587,7 @@ async function executeRun(run2, opts, headers, requestLiveBrowserHeartbeat = ()
         log.fail(`PRE-FLIGHT FAILED - ${preflightError}`);
         return;
       }
-      const preflight = await (0, import_runner_core11.resolveBaseUrlPreflight)(run2.baseUrl);
+      const preflight = await (0, import_runner_core12.resolveBaseUrlPreflight)(run2.baseUrl);
       if (preflight.error) {
         await postResult(opts.serverUrl, headers, run2.runId, { status: "ERROR", error: preflight.error });
         log.fail(`PRE-FLIGHT FAILED - ${preflight.error}`);
@@ -330338,7 +330644,7 @@ async function executeRun(run2, opts, headers, requestLiveBrowserHeartbeat = ()
         return;
       }
       const healLogStream = createHealLogStreamer(opts.serverUrl, headers, run2.runId);
-      const batchResult = await (0, import_runner_core9.executeGrokPerBatchHeal)(tests, run2.baseUrl, {
+      const batchResult = await (0, import_runner_core10.executeGrokPerBatchHeal)(tests, run2.baseUrl, {
         testVariables: run2.testVariables,
         runNativeTest: runNativeWithLiveBrowser,
         validateContext: { runId: run2.runId, serverUrl: opts.serverUrl, authHeader: headers.Authorization },
@@ -330572,7 +330878,7 @@ ${finalVerifyResult.logs ?? ""}`;
           if (classifyErrorMessage(composedError ?? null) === "config_issue") {
             apiHealStatus = "ERROR";
           } else {
-            const rlDetection = (0, import_runner_core11.detectRateLimitBlock)({
+            const rlDetection = (0, import_runner_core12.detectRateLimitBlock)({
               testName: run2.testName ?? run2.testCaseId ?? void 0,
               tags: run2.tags ?? [],
               error: composedError ?? finalVerifyResult?.error ?? null,
@@ -330679,7 +330985,7 @@ ${finalVerifyResult.logs ?? ""}`;
         log.info(`Heal engine: GROK (${source})`);
       }
       const grokHealLogStream = useGrokHeal ? createHealLogStreamer(opts.serverUrl, headers, run2.runId) : null;
-      const result2 = useGrokHeal ? await (0, import_runner_core9.executeGrokPerTestHeal)(run2.playwrightCode, run2.steps, run2.baseUrl, {
+      const result2 = useGrokHeal ? await (0, import_runner_core10.executeGrokPerTestHeal)(run2.playwrightCode, run2.steps, run2.baseUrl, {
         ...healOpts,
         onLog: grokHealLogStream.onLog
       }) : await (0, import_runner_core2.executeTestWithHealing)(run2.playwrightCode, run2.steps, run2.baseUrl, healOpts);
@@ -330712,7 +331018,7 @@ ${finalVerifyResult.logs ?? ""}`;
       let healStatus = result2.passed ? "PASSED" : isConfigIssue ? "ERROR" : "FAILED";
       let healError = result2.error;
       if (!result2.passed && !isConfigIssue) {
-        const rlDetection = (0, import_runner_core11.detectRateLimitBlock)({
+        const rlDetection = (0, import_runner_core12.detectRateLimitBlock)({
           testName: run2.testName ?? run2.testCaseId ?? void 0,
           tags: run2.tags ?? [],
           error: result2.error,
@@ -330906,7 +331212,7 @@ ${finalVerifyResult.logs ?? ""}`;
               liveBrowserHandle,
               runNativeTest: runNativeWithLiveBrowser
             };
-            const healResult = useGrokHealSuite ? await (0, import_runner_core9.executeGrokPerTestHeal)(
+            const healResult = useGrokHealSuite ? await (0, import_runner_core10.executeGrokPerTestHeal)(
               failedTest.playwrightCode,
               failedTest.steps ?? [],
               run2.baseUrl,
@@ -331194,9 +331500,16 @@ ${finalVerifyResult.logs ?? ""}`;
               signal: AbortSignal.timeout(3e4)
             });
             if (res.ok) return;
-            log.warn(`[stream] discovery-plan attempt ${attempt + 1} returned ${res.status}`);
+            const responseText = await res.text().catch(() => "");
+            const statusMessage = responseText ? `${res.status}: ${responseText.slice(0, 500)}` : String(res.status);
+            if (res.status === 409) {
+              throw new Error(`Discovery plan checkpoint rejected: ${statusMessage}`);
+            }
+            log.warn(`[stream] discovery-plan attempt ${attempt + 1} returned ${statusMessage}`);
           } catch (err) {
-            log.warn(`[stream] discovery-plan attempt ${attempt + 1} failed: ${err instanceof Error ? err.message : String(err)}`);
+            const message = err instanceof Error ? err.message : String(err);
+            if (/Discovery plan checkpoint rejected/i.test(message)) throw err;
+            log.warn(`[stream] discovery-plan attempt ${attempt + 1} failed: ${message}`);
           }
           if (attempt < 2) await new Promise((r) => setTimeout(r, 3e3 * (attempt + 1)));
         }
@@ -331204,6 +331517,7 @@ ${finalVerifyResult.logs ?? ""}`;
       };
       let discoveryResult;
       const buildFinalBody = (r, overrideError, auditWarning) => {
+        const isNativeDiscovery = ctx.medium === "IOS_NATIVE" || ctx.medium === "ANDROID_NATIVE";
         const { exploreFinalMessages: _exploreFinalMessages, ...rest } = r;
         void _exploreFinalMessages;
         const logs2 = auditWarning ? [rest.logs, auditWarning].filter(Boolean).join("\n") : rest.logs;
@@ -331253,7 +331567,7 @@ ${finalVerifyResult.logs ?? ""}`;
           resolvedAppOrigin: rest.resolvedAppOrigin,
           plans: rest.plans,
           exploreStats: rest.exploreStats,
-          screenshots: rest.screenshots,
+          ...isNativeDiscovery ? {} : { screenshots: rest.screenshots },
           snapshotEvidence: rest.snapshotEvidence,
           discoveryCheckpoints: rest.discoveryCheckpoints,
           streamedTestCount: streamedTestKeys.size,
@@ -331262,8 +331576,10 @@ ${finalVerifyResult.logs ?? ""}`;
           ...explorePosted ? {} : {
             collectedPages: rest.collectedPages,
             collectedTransitions: rest.collectedTransitions,
-            pageScreenshots: rest.pageScreenshots,
-            pageScreenshotKeys: rest.pageScreenshotKeys
+            ...isNativeDiscovery ? {} : {
+              pageScreenshots: rest.pageScreenshots,
+              pageScreenshotKeys: rest.pageScreenshotKeys
+            }
           },
           ...harPosted ? {} : {
             apiCalls: rest.apiCalls,
@@ -331271,7 +331587,7 @@ ${finalVerifyResult.logs ?? ""}`;
           },
           // Only send tests that were NOT confirmed streamed to avoid duplicates
           tests: rest.tests.filter((t) => !streamedTestKeys.has(fingerprintTest(t)))
-        }, logs2);
+        }, logs2, { omitScreenshots: isNativeDiscovery });
       };
       const acquireLoginBrowser = async () => {
         const browser = await browserPool.acquireAsync(12e3);
@@ -331375,7 +331691,6 @@ ${finalVerifyResult.logs ?? ""}`;
                   thumbnailCapturedAt: Date.now()
                 });
                 requestLiveBrowserHeartbeat();
-                void onScreenshot("mobile", base64);
               },
               onExploreComplete,
               onTestGenerated,
@@ -331402,7 +331717,7 @@ ${finalVerifyResult.logs ?? ""}`;
             setExecutorBusy(false);
           }
         } else if (ctx.mode === "import") {
-          const runRepoImport = ctx.frameworkImport?.kind === "repo-analysis" ? import_runner_core9.runRepoAnalysisOnRunner : import_runner_core9.runFrameworkImportOnRunner;
+          const runRepoImport = ctx.frameworkImport?.kind === "repo-analysis" ? import_runner_core10.runRepoAnalysisOnRunner : import_runner_core10.runFrameworkImportOnRunner;
           discoveryResult = await runRepoImport(ctx, { onTestGenerated, acquireLoginBrowser, onAudit: discoveryAudit }, {
             archiveUrl: ctx.frameworkImport?.source === "upload" ? `${opts.serverUrl}/api/runner/runs/${run2.runId}/import-archive` : void 0,
             archiveAuthHeader: headers.Authorization,
@@ -331732,7 +332047,7 @@ ${finalVerifyResult.logs ?? ""}`;
     let runStatus = result.passed ? "PASSED" : "FAILED";
     let runError = result.error;
     if (!result.passed) {
-      const rlDetection = (0, import_runner_core11.detectRateLimitBlock)({
+      const rlDetection = (0, import_runner_core12.detectRateLimitBlock)({
         testName: run2.testName ?? run2.testCaseId ?? void 0,
         tags: run2.tags ?? [],
         error: result.error,
@@ -331870,7 +332185,7 @@ async function startRunner(opts) {
     capture: envInt("MAX_CAPTURE", DEFAULT_TYPE_LIMITS.capture),
     run: envInt("MAX_RUN", DEFAULT_TYPE_LIMITS.run)
   };
-  const RESOURCE_GOVERNOR_OPTIONS = (0, import_runner_core11.createResourceGovernorOptions)({
+  const RESOURCE_GOVERNOR_OPTIONS = (0, import_runner_core12.createResourceGovernorOptions)({
     isCloud: IS_CLOUD,
     maxConcurrent: MAX_CONCURRENT,
     typeLimits: TYPE_LIMITS
@@ -332021,8 +332336,8 @@ async function startRunner(opts) {
         android: devices.some((d) => d.platform === "ANDROID" && d.isAvailable && d.state === "BOOTED")
       } : { web: true, ios: false, android: false };
       const bridge = enableMobile ? getBridgeState() : void 0;
-      const resourceStatus = (0, import_runner_core11.getResourceGovernorStatus)(RESOURCE_GOVERNOR_OPTIONS, Object.fromEntries(activeByType));
-      const processInventory = await (0, import_runner_core11.getBrowserProcessInventory)();
+      const resourceStatus = (0, import_runner_core12.getResourceGovernorStatus)(RESOURCE_GOVERNOR_OPTIONS, Object.fromEntries(activeByType));
+      const processInventory = await (0, import_runner_core12.getBrowserProcessInventory)();
       lastInventoryPids = new Set(processInventory.processes.map((p) => p.pid));
       lastInventoryKinds.clear();
       for (const p of processInventory.processes) lastInventoryKinds.set(p.pid, p.kind);
@@ -332049,8 +332364,8 @@ async function startRunner(opts) {
           resourceSnapshot: resourceStatus.snapshot,
           resourceGovernor: resourceStatus.governor,
           processInventory,
-          aiQueue: (0, import_runner_core11.getRunnerAIQueueStats)(),
-          liveBrowsers: import_runner_core10.liveBrowserRegistry.snapshotForHeartbeat(),
+          aiQueue: (0, import_runner_core12.getRunnerAIQueueStats)(),
+          liveBrowsers: import_runner_core11.liveBrowserRegistry.snapshotForHeartbeat(),
           // Pre-flight checks (ANDROID_HOME, Xcode, Appium drivers, adb, etc).
           // Cached & cheap — see getCachedDoctor above.
           doctor: getCachedDoctor()
@@ -332144,7 +332459,7 @@ async function startRunner(opts) {
   let pidsWatchdogWarned = false;
   const pidsWatchdog = setInterval(() => {
     if (shuttingDown) return;
-    const snapshot = (0, import_runner_core11.getResourceSnapshot)();
+    const snapshot = (0, import_runner_core12.getResourceSnapshot)();
     const pct = snapshot.pidsPct;
     if (pct == null || !Number.isFinite(pct)) return;
     if (pct >= PIDS_RECYCLE_PCT) {
@@ -332180,7 +332495,7 @@ async function startRunner(opts) {
               log.dim(`  Deferred ${run2.runId} (project ${runProject} at capacity ${getActiveForProject(runProject)}/${projectLimit})`);
               continue;
             }
-            const admission = (0, import_runner_core11.evaluateRunAdmission)(RESOURCE_GOVERNOR_OPTIONS, {
+            const admission = (0, import_runner_core12.evaluateRunAdmission)(RESOURCE_GOVERNOR_OPTIONS, {
               mode: runMode,
               activeRuns,
               activeByType: Object.fromEntries(activeByType),