@validate.qa/runner 1.0.9 → 1.0.13

package/dist/cli.mjs

@@ -238,6 +238,9 @@ var require_ai_provider = __commonJS({
     exports.getNoThinkingRequestOptions = getNoThinkingRequestOptions;
     exports.getAIClient = getAIClient;
     exports.getClientForModel = getClientForModel;
+    exports.shouldProxyAIThroughServerForLocalRunner = shouldProxyAIThroughServerForLocalRunner;
+    exports.getRunnerAIClient = getRunnerAIClient;
+    exports.getRunnerClientForModel = getRunnerClientForModel;
     exports.getModel = getModel;
     exports.resolveModelForTask = resolveModelForTask;
     exports.getAvailableModels = getAvailableModels;
@@ -268,14 +271,16 @@ var require_ai_provider = __commonJS({
       { id: "minimax-m2.7", label: "MiniMax M2.7", provider: "minimax", description: "Fast M2.7 tier (Highspeed); auto-fails over to standard M2.7, ~200K ctx", contextWindow: 2e5 },
       { id: "claude-sonnet-4-6", label: "Claude Sonnet 4.6", provider: "anthropic", description: "Anthropic - fast & intelligent, 200k ctx", contextWindow: 2e5 },
       { id: "nvidia-nemotron-nano", label: "NVIDIA Nemotron Nano", provider: "nvidia", description: "NVIDIA NIM - Nemotron 30B Nano, reasoning model, 128k ctx", contextWindow: 128e3 },
-      { id: "nvidia-kimi-k2.6", label: "NVIDIA Kimi K2.6", provider: "nvidia", description: "NVIDIA NIM - Moonshot Kimi K2.6, multimodal coding and agentic model, 256k ctx", contextWindow: 256e3 }
+      { id: "nvidia-kimi-k2.6", label: "NVIDIA Kimi K2.6", provider: "nvidia", description: "NVIDIA NIM - Moonshot Kimi K2.6, multimodal coding and agentic model, 256k ctx", contextWindow: 256e3 },
+      { id: "deepseek-v4-flash", label: "DeepSeek V4 Flash", provider: "deepseek", description: "DeepSeek - V4 Flash, OpenAI-compatible, 1M ctx", contextWindow: 1e6 }
     ];
     var PROVIDER_DEFAULT_MODEL = {
       openai: "gpt-4o",
       xai: "grok-build-0.1",
       anthropic: "claude-sonnet-4-6",
       minimax: "minimax-m3",
-      nvidia: "nvidia-nemotron-nano"
+      nvidia: "nvidia-nemotron-nano",
+      deepseek: "deepseek-v4-flash"
     };
     function getContextConfig(modelId) {
       const info = exports.AI_MODEL_CATALOG.find((m) => m.id === modelId);
@@ -326,7 +331,8 @@ var require_ai_provider = __commonJS({
       "minimax-m2.7-highspeed": { strong: "MiniMax-M2.7-highspeed", fast: "MiniMax-M2.7-highspeed", agent: "MiniMax-M2.7-highspeed" },
       "claude-sonnet-4-6": { strong: "claude-sonnet-4-6", fast: "claude-sonnet-4-6", agent: "claude-sonnet-4-6" },
       "nvidia-nemotron-nano": { strong: "nvidia/nemotron-3-nano-30b-a3b", fast: "nvidia/nemotron-3-nano-30b-a3b", agent: "nvidia/nemotron-3-nano-30b-a3b" },
-      "nvidia-kimi-k2.6": { strong: "moonshotai/kimi-k2.6", fast: "moonshotai/kimi-k2.6", agent: "moonshotai/kimi-k2.6" }
+      "nvidia-kimi-k2.6": { strong: "moonshotai/kimi-k2.6", fast: "moonshotai/kimi-k2.6", agent: "moonshotai/kimi-k2.6" },
+      "deepseek-v4-flash": { strong: "deepseek-v4-flash", fast: "deepseek-v4-flash", agent: "deepseek-v4-flash" }
     };
     var _requestModelStorage = new async_hooks_1.AsyncLocalStorage();
     function withModelContext(modelId, fn) {
@@ -388,6 +394,9 @@ var require_ai_provider = __commonJS({
       if (modelId === "nvidia/nemotron-3-nano-30b-a3b") {
         return { chat_template_kwargs: { enable_thinking: false } };
       }
+      if (modelId === "deepseek-v4-flash") {
+        return { thinking: { type: "disabled" } };
+      }
       return {};
     }
     exports.MINIMAX_FALLBACK_CHAIN = ["MiniMax-M3", "MiniMax-M2.7-highspeed", "MiniMax-M2.7"];
@@ -489,6 +498,11 @@ var require_ai_provider = __commonJS({
         if (!apiKey)
           throw new Error("NVIDIA_API_KEY is required when using an NVIDIA model");
         client = new openai_1.default({ apiKey, baseURL: process.env.NVIDIA_API_BASE ?? "https://integrate.api.nvidia.com/v1" });
+      } else if (provider === "deepseek") {
+        const apiKey = process.env.DEEPSEEK_API_KEY;
+        if (!apiKey)
+          throw new Error("DEEPSEEK_API_KEY is required when using a DeepSeek model");
+        client = new openai_1.default({ apiKey, baseURL: process.env.DEEPSEEK_API_BASE ?? "https://api.deepseek.com" });
       } else {
         const apiKey = process.env.OPENAI_API_KEY;
         if (!apiKey)
@@ -504,6 +518,21 @@ var require_ai_provider = __commonJS({
     function getClientForModel(modelId) {
       return buildClientForProvider(getProviderForModel(modelId));
     }
+    function shouldProxyAIThroughServerForLocalRunner() {
+      const serverUrl = (process.env.SERVER_URL ?? "").trim();
+      const token = (process.env.AUTH_TOKEN || process.env.RUNNER_TOKEN || "").trim();
+      return serverUrl.length > 0 && token.startsWith("urt_");
+    }
+    function getRunnerAIClient() {
+      if (shouldProxyAIThroughServerForLocalRunner())
+        return getServerProxiedAIClient();
+      return getAIClient();
+    }
+    function getRunnerClientForModel(modelId) {
+      if (shouldProxyAIThroughServerForLocalRunner())
+        return getServerProxiedClientForModel(modelId);
+      return getClientForModel(modelId);
+    }
     function getModel(type) {
       return MODEL_TASK_MAP[getActiveModelId()][type];
     }
@@ -522,6 +551,8 @@ var require_ai_provider = __commonJS({
         return !!process.env.ANTHROPIC_API_KEY?.trim();
       if (provider === "nvidia")
         return !!process.env.NVIDIA_API_KEY?.trim();
+      if (provider === "deepseek")
+        return !!process.env.DEEPSEEK_API_KEY?.trim();
       return false;
     }
     function getAvailableModels() {
@@ -572,7 +603,7 @@ var require_ai_provider = __commonJS({
       const create = async (params, options) => {
         const modelId = typeof params.model === "string" ? params.model : "";
         if (!modelId) {
-          throw new Error("server-proxied AI client requires params.model (catalog id)");
+          throw new Error("server-proxied AI client requires params.model");
         }
         const body = {
           modelId,
@@ -742,6 +773,21 @@ var require_mobile_source_parser = __commonJS({
       const attrText = inner.slice(tag.length);
       return { tag, attrs: parseAttributes(attrText), selfClosing };
     }
+    function findTagEnd(xml, from) {
+      let quote = null;
+      for (let i = from; i < xml.length; i++) {
+        const ch = xml[i];
+        if (quote !== null) {
+          if (ch === quote)
+            quote = null;
+        } else if (ch === '"' || ch === "'") {
+          quote = ch;
+        } else if (ch === ">") {
+          return i;
+        }
+      }
+      return -1;
+    }
     function tokenize(xml) {
       if (!xml || typeof xml !== "string")
         return null;
@@ -764,7 +810,7 @@ var require_mobile_source_parser = __commonJS({
           i = end === -1 ? len : end + 3;
           continue;
         }
-        const gt = xml.indexOf(">", lt + 1);
+        const gt = findTagEnd(xml, lt + 1);
         if (gt === -1)
           break;
         const tagBody = xml.slice(lt + 1, gt);
@@ -1549,6 +1595,25 @@ function buildAppiumCode(testName, target, steps) {
     `    await driver.keys(text);`,
     `  }`,
     `}`,
+    ``,
+    `async function __clearFocused(driver: WebdriverIO.Browser) {`,
+    `  await (await driver.getActiveElement() as unknown as WebdriverIO.Element).clearValue();`,
+    `}`,
+    ``,
+    `async function __textCandidates(el: WebdriverIO.Element) {`,
+    `  const __values: string[] = [];`,
+    `  const __push = (__value: unknown) => {`,
+    `    if (typeof __value !== 'string') return;`,
+    `    const __trimmed = __value.trim();`,
+    `    if (__trimmed.length === 0 || __values.includes(__trimmed)) return;`,
+    `    __values.push(__trimmed);`,
+    `  };`,
+    `  __push(await el.getText().catch(() => ''));`,
+    `  for (const __attr of ['text', 'content-desc', 'contentDescription', 'name', 'label', 'value']) {`,
+    `    __push(await el.getAttribute(__attr).catch(() => ''));`,
+    `  }`,
+    `  return __values;`,
+    `}`,
     ...hasSwipe ? [
       ``,
       `// Read the device window with a few retries (matches the runtime executor).`,
@@ -1628,6 +1693,12 @@ function buildAppiumCode(testName, target, steps) {
       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 === "clear" && bounds) {
+      const x = Math.round(bounds.x + bounds.width / 2);
+      const y = Math.round(bounds.y + bounds.height / 2);
+      lines.push(`    await __tapAt(driver, ${x}, ${y});`);
+      lines.push(`    await driver.pause(${MOBILE_FOCUS_SETTLE_MS});`);
+      lines.push(`    await __clearFocused(driver);`);
     } else if (step.action === "assertVisible" && hasSelector) {
       lines.push(`    if (!(await (await findFirst(driver, ${candidatesLiteral})).isDisplayed())) {`);
       lines.push(`      throw new Error('Assertion failed: element not displayed: ' + ${toJsStringLiteral(candidatesLiteral)});`);
@@ -1635,8 +1706,9 @@ function buildAppiumCode(testName, target, steps) {
     } else if (step.action === "assertText" && hasSelector) {
       lines.push(`    {`);
       lines.push(`      const __expected = ${toJsStringLiteral(step.assertion ?? "")};`);
-      lines.push(`      const __actual = await (await findFirst(driver, ${candidatesLiteral})).getText();`);
-      lines.push(`      if (!__actual.includes(__expected)) {`);
+      lines.push(`      if (__expected.length === 0) throw new Error('assertText step is missing expected text');`);
+      lines.push(`      const __actual = await __textCandidates(await findFirst(driver, ${candidatesLiteral}));`);
+      lines.push(`      if (!__actual.some((__value) => __value.includes(__expected))) {`);
       lines.push(`        throw new Error('Assertion failed: expected text to contain ' + JSON.stringify(__expected) + ' but got ' + JSON.stringify(__actual));`);
       lines.push(`      }`);
       lines.push(`    }`);
@@ -4343,6 +4415,7 @@ var require_mobile_observation = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.renderMobileObservation = renderMobileObservation;
     exports.summarizeScreenForEvidence = summarizeScreenForEvidence;
+    exports.buildCollectedElementsForScreen = buildCollectedElementsForScreen;
     var DEFAULT_MAX_ELEMENTS = 60;
     var MAX_LABEL_LENGTH = 80;
     var EVIDENCE_LABEL_LIMIT = 40;
@@ -4384,6 +4457,46 @@ var require_mobile_observation = __commonJS({
       }
       return { elementCount, actionableCount, labels };
     }
+    function buildCollectedElementsForScreen(elements, opts = {}) {
+      const navigationRefs = opts.navigationRefs ?? EMPTY_REF_SET;
+      const out = [];
+      const seen = /* @__PURE__ */ new Set();
+      for (const element of elements) {
+        if (!element.actionable)
+          continue;
+        const collected = toCollectedPageElement(element, navigationRefs.has(element.ref));
+        const identity = `${collected.elementType}|${collected.testId ?? ""}|${collected.label ?? ""}`;
+        if (seen.has(identity))
+          continue;
+        seen.add(identity);
+        out.push(collected);
+      }
+      return out;
+    }
+    var EMPTY_REF_SET = /* @__PURE__ */ new Set();
+    function toCollectedPageElement(element, triggersNavigation) {
+      const label = element.label?.trim() || element.text?.trim() || void 0;
+      const stableId = element.accessibilityId?.trim() || element.resourceId?.trim() || void 0;
+      const locators = [];
+      if (stableId)
+        locators.push({ strategy: "getByTestId", value: stableId, confidence: 0.95 });
+      const xpath = element.xpath?.trim();
+      if (xpath)
+        locators.push({ strategy: "css", value: xpath, confidence: 0.4 });
+      const collected = {
+        elementType: element.role || "View",
+        triggersNavigation
+      };
+      if (label)
+        collected.label = label;
+      if (stableId)
+        collected.testId = stableId;
+      if (locators.length > 0)
+        collected.locators = locators;
+      if (element.enabled === false)
+        collected.isDisabled = true;
+      return collected;
+    }
     function buildHeaderLine(screen) {
       const parts = ["screen:"];
       const name = screenDisplayName(screen.screenSignal);
@@ -4832,7 +4945,7 @@ var require_mobile_explorer = __commonJS({
       }
       return sections.join("\n");
     }
-    function buildSystemPrompt(mode, platform3, enableRecordJourney, maxIterations, appBrief, targetAppId) {
+    function buildSystemPrompt(mode, platform3, enableRecordJourney, maxIterations, appBrief, targetAppId, existingScreens) {
       const platformLabel = platform3 === "IOS" ? "iOS" : "Android";
       const targetLine = targetAppId ? ` Target app package/bundle: ${targetAppId}.` : "";
       const surveyBody = `You are a mobile QA exploration agent driving a real ${platformLabel} app on a connected device. Your goal: MAP every reachable screen so downstream agents know what to test. You are NOT testing \u2014 you are building a complete screen map.
@@ -4878,13 +4991,18 @@ Max iterations: ${maxIterations}. You will be warned near the end.`;
 ## Application Brief
 ${appBrief}
 Use this to prioritize which screens and flows to cover.` : "";
-      return `${mode === "survey" ? surveyBody : deepBody}${briefBlock}`;
+      const existingScreensBlock = mode === "survey" && existingScreens && existingScreens.length > 0 ? `
+
+## ALREADY DISCOVERED SCREENS (skip these; find new)
+These screens were mapped in a previous survey. Do NOT re-map them \u2014 use your budget to find NEW screens and flows not listed here. If you land on one of these, move on to something new.
+${existingScreens.slice(0, 100).map((s) => `- ${s.screenId}${s.name ? ` "${s.name}"` : ""}${s.screenType ? ` [${s.screenType}]` : ""}`).join("\n")}` : "";
+      return `${mode === "survey" ? surveyBody : deepBody}${briefBlock}${existingScreensBlock}`;
     }
     function buildKickoffMessage(mode) {
       return mode === "survey" ? "Start by calling mobile_snapshot on the launch screen, then capture_screen. Map the entire app: open every tab, menu, and one row per list. Record transitions as you go." : "Start by calling mobile_snapshot on the launch screen. Then use the features: fill fields, submit forms, open menus, and observe outcomes. Record journeys after meaningful flows.";
     }
     async function runMobileExplorePhase(args) {
-      const { ctx, driver, state: state2, config, onLog, onAICall, onScreenshot } = args;
+      const { ctx, driver, state: state2, config, onLog, onAICall, onScreenshot, onScreenshotUpload, existingScreens } = args;
       const logs2 = [];
       const log2 = (line) => {
         logs2.push(line);
@@ -4908,6 +5026,9 @@ Use this to prioritize which screens and flows to cover.` : "";
       log2(`Budget: ${maxIterations} iterations | app: ${ctx.target?.appId ?? "(unknown)"}`);
       const screenshots = [];
       const pageScreenshots = {};
+      const pageScreenshotKeys = {};
+      const uploadedScreenIds = /* @__PURE__ */ new Set();
+      const pendingScreenshotUploads = [];
       const collectedTransitions = [];
       const journeys = [];
       const counters = {
@@ -4926,6 +5047,14 @@ Use this to prioritize which screens and flows to cover.` : "";
           screenshots.push(base64);
         if (screenId)
           pageScreenshots[screenId] = base64;
+        if (screenId && onScreenshotUpload && !uploadedScreenIds.has(screenId)) {
+          uploadedScreenIds.add(screenId);
+          pendingScreenshotUploads.push(onScreenshotUpload(screenId, base64).then((key) => {
+            if (key)
+              pageScreenshotKeys[screenId] = key;
+          }).catch(() => {
+          }));
+        }
         try {
           onScreenshot?.(base64);
         } catch {
@@ -5030,7 +5159,7 @@ Use this to prioritize which screens and flows to cover.` : "";
           return null;
         return { element, bounds: element.bounds };
       };
-      const systemPrompt = buildSystemPrompt(mode, platform3, enableRecordJourney, maxIterations, ctx.appBrief, targetAppId);
+      const systemPrompt = buildSystemPrompt(mode, platform3, enableRecordJourney, maxIterations, ctx.appBrief, targetAppId, existingScreens);
       const kickoff = buildKickoffMessage(mode);
       const recentExchanges = [];
       const transientDirectives = [];
@@ -5238,6 +5367,9 @@ Exploration complete: ${summary}`);
           summary = `Explore phase aborted (${truncatedReason}) after mapping ${state2.getScreenCount()} screen(s).`;
         }
       }
+      if (pendingScreenshotUploads.length > 0) {
+        await Promise.allSettled(pendingScreenshotUploads);
+      }
       const collectedPages = state2.buildInMemoryScreenMap();
       counters.pagesVisited = collectedPages.length;
       if (counters.pagesDiscovered < collectedPages.length) {
@@ -5272,6 +5404,9 @@ Exploration complete: ${summary}`);
       if (Object.keys(pageScreenshots).length > 0) {
         result.pageScreenshots = pageScreenshots;
       }
+      if (Object.keys(pageScreenshotKeys).length > 0) {
+        result.pageScreenshotKeys = pageScreenshotKeys;
+      }
       if (truncated) {
         result.truncated = true;
         result.truncatedReason = truncatedReason;
@@ -5773,6 +5908,44 @@ var require_snapshot_parser = __commonJS({
     };
     var SUBMIT_LABEL_RE = /^(submit|sign\s*in|sign\s*up|log\s*in|register|create|save|send|confirm|continue|next|apply|post|publish|add|update|go)$/i;
     var GENERIC_LABEL_RE = /^(input field|textbox|button|link|item|field|value|tab)$/i;
+    var RICH_CONTEXT_ROLES = /* @__PURE__ */ new Set(["table", "grid", "row", "radiogroup"]);
+    var RICH_CONTEXT_LABEL_MAX = 60;
+    var VALUE_BEARING_ROLES = /* @__PURE__ */ new Set(["textbox", "searchbox", "combobox", "spinbutton", "listbox", "slider"]);
+    var SENSITIVE_VALUE_LABEL_RE = /\bpass(?:word|code|phrase)?\b|\bpassport\b|\bpwd\b|\bsecrets?\b|\btokens?\b|\botp\b|one[- ]?time|\bpin\b|\bcvv\b|\bcvc\b|card\s*number|\bssn\b|social\s*security|security\s*(?:answer|question)|api[-_ ]?key|private\s*key|\bauth\b|authoriz|authenticat|credential/i;
+    var REDACTED_VALUE = "[redacted]";
+    var VALUE_TEXT_MAX = 120;
+    var SIGNAL_TEXT_RE = /\b(?:showing|displaying|page)\b[\s\S]*\b(?:of|results?|items?|entries)\b|\b(?:no|nothing)\b[\s\S]*\b(?:found|yet|available|results?|items?)\b|\bempty\b|\b(?:error|invalid|required|failed|expired?|success(?:fully)?|saved|updated|deleted|created|welcome)\b/i;
+    var STATIC_MESSAGES_MAX = 12;
+    var OPTIONS_PER_ELEMENT_MAX = 24;
+    var URL_CHILD_LINE_RE = /^(\s*)- \/url:\s*(.+)$/;
+    var MESSAGE_TOKEN_RE = /\b(?:sk|pk|rk|ak|key|tok)[-_][A-Za-z0-9_-]{8,}\b|\b[A-Za-z0-9_-]{24,}\b/g;
+    function stripYamlQuotes(raw) {
+      const trimmed = raw.trim();
+      if (trimmed.length >= 2 && (trimmed.startsWith('"') && trimmed.endsWith('"') || trimmed.startsWith("'") && trimmed.endsWith("'"))) {
+        return trimmed.slice(1, -1);
+      }
+      return trimmed;
+    }
+    function extractTrailingText(attrs) {
+      const lastBracket = attrs.lastIndexOf("]");
+      const tail = lastBracket >= 0 ? attrs.slice(lastBracket + 1) : attrs;
+      const match = /^\s*:\s+(.+)$/.exec(tail);
+      if (!match)
+        return null;
+      const text = stripYamlQuotes(match[1]);
+      if (!text || /^(?:\||\|-|>|>-)$/.test(text))
+        return null;
+      return text;
+    }
+    function isSensitiveValueField(name, placeholder) {
+      return SENSITIVE_VALUE_LABEL_RE.test(`${name ?? ""} ${placeholder ?? ""}`);
+    }
+    function scrubMessageText(text) {
+      return text.replace(MESSAGE_TOKEN_RE, REDACTED_VALUE);
+    }
+    function capText(text, max) {
+      return text.length > max ? `${text.slice(0, max - 1)}\u2026` : text;
+    }
     function isProbablyDynamicTestId(testId) {
       if (testId.length < 6)
         return false;
@@ -5848,9 +6021,12 @@ var require_snapshot_parser = __commonJS({
       }
       return e.name;
     }
-    function parseSnapshot(snapshotText) {
+    function parseSnapshot(snapshotText, options = {}) {
+      const richParse = options.richParse ?? process.env.DISCOVERY_SNAPSHOT_RICH_PARSE === "true";
       const lines = snapshotText.split("\n");
       const elements = [];
+      const liveMessages = [];
+      const textMessages = [];
       const seenRefs = /* @__PURE__ */ new Set();
       let parsedElementLineCount = 0;
       let genericLabelCount = 0;
@@ -5859,6 +6035,21 @@ var require_snapshot_parser = __commonJS({
       const contextStack = [];
       const completedForms = [];
       for (const line of lines) {
+        if (richParse) {
+          const urlMatch = URL_CHILD_LINE_RE.exec(line);
+          if (urlMatch) {
+            const urlIndent = urlMatch[1].length;
+            for (let i = elements.length - 1; i >= 0; i--) {
+              const el = elements[i];
+              if (el.indentDepth < urlIndent) {
+                if (el.role === "link" && !el.href)
+                  el.href = capText(stripYamlQuotes(urlMatch[2]), 300);
+                break;
+              }
+            }
+            continue;
+          }
+        }
         const match = ELEMENT_LINE_RE.exec(line);
         if (!match)
           continue;
@@ -5880,7 +6071,7 @@ var require_snapshot_parser = __commonJS({
         }
         const headingLevelMatch = LEVEL_RE.exec(attrs);
         const headingLevel = headingLevelMatch ? Number.parseInt(headingLevelMatch[1], 10) : null;
-        const contextLabel = buildContextLabel(role, name ?? null, headingLevel);
+        const contextLabel = buildContextLabel(role, name ?? null, headingLevel, richParse);
         if (contextLabel) {
           contextStack.push({ indent: indentDepth, label: contextLabel });
         }
@@ -5893,6 +6084,40 @@ var require_snapshot_parser = __commonJS({
           });
           continue;
         }
+        if (richParse) {
+          if (role === "option" && name) {
+            for (let i = elements.length - 1; i >= 0; i--) {
+              const el = elements[i];
+              if (el.indentDepth < indentDepth) {
+                if (el.role === "combobox" || el.role === "listbox") {
+                  el.options ??= [];
+                  if (el.options.length < OPTIONS_PER_ELEMENT_MAX) {
+                    el.options.push({ label: capText(name, 80), selected: parseBooleanState(SELECTED_RE.exec(attrs)) === true });
+                  }
+                }
+                break;
+              }
+            }
+          }
+          if (role === "alert" || role === "status" || role === "paragraph" || role === "text") {
+            const text = extractTrailingText(attrs) ?? (name || null);
+            const isLiveRegion = role === "alert" || role === "status";
+            if (text && (isLiveRegion || SIGNAL_TEXT_RE.test(text))) {
+              const capped = capText(scrubMessageText(text), VALUE_TEXT_MAX);
+              const ref2 = REF_RE.exec(attrs)?.[1] ?? null;
+              if (isLiveRegion) {
+                const textDupIndex = textMessages.findIndex((m) => m.text === capped);
+                if (textDupIndex >= 0)
+                  textMessages.splice(textDupIndex, 1);
+                if (liveMessages.length < STATIC_MESSAGES_MAX && !liveMessages.some((m) => m.text === capped)) {
+                  liveMessages.push({ role, text: capped, ref: ref2 });
+                }
+              } else if (textMessages.length < STATIC_MESSAGES_MAX && !textMessages.some((m) => m.text === capped) && !liveMessages.some((m) => m.text === capped)) {
+                textMessages.push({ role: "text", text: capped, ref: ref2 });
+              }
+            }
+          }
+        }
         if (!INTERACTIVE_ROLES.has(role))
           continue;
         const refMatch = REF_RE.exec(attrs);
@@ -5925,6 +6150,13 @@ var require_snapshot_parser = __commonJS({
         }
         const isLink = role === "link";
         const isSubmitButton = role === "button" && name != null && SUBMIT_LABEL_RE.test(name);
+        let value = null;
+        if (richParse && VALUE_BEARING_ROLES.has(role)) {
+          const trailing = extractTrailingText(attrs);
+          if (trailing) {
+            value = isSensitiveValueField(name ?? null, placeholder) ? REDACTED_VALUE : capText(trailing, VALUE_TEXT_MAX);
+          }
+        }
         const element = {
           ref,
           role,
@@ -5946,7 +6178,10 @@ var require_snapshot_parser = __commonJS({
           pressed,
           headingLevel,
           currentState,
-          containerPath
+          containerPath,
+          href: null,
+          value,
+          options: null
         };
         if (isGenericLabel(element.name))
           genericLabelCount++;
@@ -5974,6 +6209,9 @@ var require_snapshot_parser = __commonJS({
       return {
         elements,
         formGroups: completedForms,
+        // live regions first: they carry their own reservation so an end-of-body toast can
+        // never be starved out by signal-matching plain text earlier in the document.
+        staticMessages: [...liveMessages, ...textMessages].slice(0, STATIC_MESSAGES_MAX),
         rawLineCount: lines.length,
         parsedElementLineCount,
         genericLabelCount,
@@ -6084,12 +6322,17 @@ var require_snapshot_parser = __commonJS({
         return "mixed";
       return false;
     }
-    function buildContextLabel(role, name, headingLevel) {
+    function buildContextLabel(role, name, headingLevel, richContext = false) {
       if (role === "heading") {
         if (!name)
           return null;
         return headingLevel ? `heading${headingLevel}:${name}` : `heading:${name}`;
       }
+      if (richContext && RICH_CONTEXT_ROLES.has(role)) {
+        if (!name)
+          return null;
+        return `${role}:${capText(name.replace(/>/g, "\u203A"), RICH_CONTEXT_LABEL_MAX)}`;
+      }
       if (!CONTEXT_ROLES.has(role))
         return null;
       if (name)
@@ -7799,7 +8042,7 @@ Each entry is exactly one of:
       const systemPrompt = options.systemPromptOverride ?? (context.mode === "survey" ? SURVEY_SYSTEM_PROMPT : exports.SCENARIO_SYSTEM_PROMPT);
       const userPrompt = options.userPromptOverride ?? formatEvidenceForPlanner(compressed, evidence, context);
       logs2.push(`AI planner: ~${Math.ceil(userPrompt.length / 3.5)} input tokens`);
-      const aiClient = options.aiClient ?? (options.modelOverride ? (0, ai_provider_js_1.getClientForModel)(options.modelOverride) : (0, ai_provider_js_1.getAIClient)());
+      const aiClient = options.aiClient ?? (options.modelOverride ? (0, ai_provider_js_1.getRunnerClientForModel)(options.modelOverride) : (0, ai_provider_js_1.getRunnerAIClient)());
       const messages = [
         { role: "system", content: systemPrompt },
         { role: "user", content: userPrompt }
@@ -7807,18 +8050,22 @@ Each entry is exactly one of:
       const callStart = Date.now();
       let response;
       try {
-        response = await (0, ai_retry_js_1.withAIRetry)(() => (0, ai_queue_js_1.queuedAICall)(() => aiClient.chat.completions.create({
-          model: agentModel,
-          messages,
-          max_tokens: plannerMaxTokens,
-          temperature: 0.3,
-          ...(0, ai_provider_js_1.getJsonObjectResponseFormat)(agentModel),
-          ...(0, ai_provider_js_1.getNoThinkingRequestOptions)(agentModel)
-        })), {
+        response = await (0, ai_retry_js_1.resilientAICall)((signal, arm) => (0, ai_queue_js_1.queuedAICall)(() => {
+          arm();
+          return aiClient.chat.completions.create({
+            model: agentModel,
+            messages,
+            max_tokens: plannerMaxTokens,
+            temperature: 0.3,
+            ...(0, ai_provider_js_1.getJsonObjectResponseFormat)(agentModel),
+            ...(0, ai_provider_js_1.getNoThinkingRequestOptions)(agentModel)
+          }, { signal });
+        }), {
           label: "ai-planner",
           baseDelayMs: 5e3,
           maxRetries: 2,
-          onRetry: (attempt, status, delay) => logs2.push(`AI planner call failed (${status ?? "error"}) \u2014 retry ${attempt}/2 in ${Math.round(delay / 1e3)}s`)
+          deferTimeoutUntilArmed: true,
+          onRetry: (attempt, reason, delay) => logs2.push(`AI planner call failed (${reason}) \u2014 retry ${attempt} in ${Math.round(delay / 1e3)}s`)
         });
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
@@ -7884,18 +8131,25 @@ Each entry is exactly one of:
         const retryStart = Date.now();
         let retryResponse = null;
         try {
-          retryResponse = await (0, ai_retry_js_1.withAIRetry)(() => (0, ai_queue_js_1.queuedAICall)(() => aiClient.chat.completions.create({
-            model: agentModel,
-            messages: [
-              ...messages,
-              { role: "assistant", content: raw },
-              { role: "user", content: retryContext }
-            ],
-            max_tokens: plannerMaxTokens,
-            temperature: 0.3,
-            ...(0, ai_provider_js_1.getJsonObjectResponseFormat)(agentModel),
-            ...(0, ai_provider_js_1.getNoThinkingRequestOptions)(agentModel)
-          })), { label: "ai-planner-retry" });
+          retryResponse = await (0, ai_retry_js_1.resilientAICall)((signal, arm) => (0, ai_queue_js_1.queuedAICall)(() => {
+            arm();
+            return aiClient.chat.completions.create({
+              model: agentModel,
+              messages: [
+                ...messages,
+                { role: "assistant", content: raw },
+                { role: "user", content: retryContext }
+              ],
+              max_tokens: plannerMaxTokens,
+              temperature: 0.3,
+              ...(0, ai_provider_js_1.getJsonObjectResponseFormat)(agentModel),
+              ...(0, ai_provider_js_1.getNoThinkingRequestOptions)(agentModel)
+            }, { signal });
+          }), {
+            label: "ai-planner-retry",
+            deferTimeoutUntilArmed: true,
+            onRetry: (attempt, reason, delay) => logs2.push(`AI planner retry call failed (${reason}) \u2014 retry ${attempt} in ${Math.round(delay / 1e3)}s`)
+          });
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);
           logs2.push(`AI planner retry failed (${message}) \u2014 using first-pass result`);
@@ -8423,12 +8677,12 @@ ${constraints.join("\n")}`);
       const orderedScreens = targetAppScreens(graph, appId).filter((state2) => state2.screenType?.toLowerCase() !== "error").sort((a, b) => a.firstSeenIteration - b.firstSeenIteration);
       const includedScreenIds = new Set(orderedScreens.map((state2) => state2.screenId));
       for (const state2 of orderedScreens) {
-        const groupName = state2.screenType === "auth" ? "Authentication" : screenDisplayName(state2);
+        const groupName = state2.screenType?.toLowerCase() === "auth" ? "Authentication" : screenDisplayName(state2);
         const group = groups.get(groupName) ?? {
           name: groupName,
           description: `Native mobile screens related to ${groupName}.`,
           routes: [],
-          criticality: state2.screenType === "auth" ? "critical" : "medium",
+          criticality: state2.screenType?.toLowerCase() === "auth" ? "critical" : "medium",
           pages: [],
           flows: []
         };
@@ -8451,7 +8705,7 @@ ${constraints.join("\n")}`);
         const to = graph.screens.get(transition.toScreenId);
         if (!from || !to)
           continue;
-        const groupName = from.screenType === "auth" ? "Authentication" : screenDisplayName(from);
+        const groupName = from.screenType?.toLowerCase() === "auth" ? "Authentication" : screenDisplayName(from);
         const group = groups.get(groupName);
         if (!group)
           continue;
@@ -8496,9 +8750,9 @@ ${constraints.join("\n")}`);
         scenarios.push({
           name,
           type: "HAPPY_PATH",
-          priority: state2.screenType === "auth" ? 1 : 3,
+          priority: state2.screenType?.toLowerCase() === "auth" ? 1 : 3,
           variant: "happy",
-          featureGroup: state2.screenType === "auth" ? "Authentication" : screenName,
+          featureGroup: state2.screenType?.toLowerCase() === "auth" ? "Authentication" : screenName,
           goal: `User can reach and inspect the ${screenName} screen`,
           steps,
           expectedOutcomes: [{
@@ -8644,6 +8898,7 @@ var require_mobile_generator = __commonJS({
     var mobile_observation_js_1 = require_mobile_observation();
     var mobile_boundary_js_1 = require_mobile_boundary();
     var MAX_SCENARIO_ITERATIONS = 30;
+    var MAX_CONSECUTIVE_INFRA_FAILURES = 3;
     var MAX_RECENT_EXCHANGES = 24;
     var OBSERVATION_MAX_ELEMENTS = 50;
     function finalizeAction(input) {
@@ -9368,14 +9623,31 @@ ${statePacket}` },
       if (!snapshot || snapshot.screen.elements.length === 0)
         return null;
       const elements = snapshot.screen.elements;
-      const withStableId = elements.filter((el) => hasStableId(el));
-      const nonButton = withStableId.find((el) => !/button/i.test(el.role));
+      const stableAnchors = elements.filter((el) => hasStableId(el) && !isAlwaysPresentContainer(el));
+      const contentfulNonButton = stableAnchors.find((el) => !/button/i.test(el.role) && (nonEmpty2(el.label) || nonEmpty2(el.text)));
+      if (contentfulNonButton)
+        return contentfulNonButton;
+      const nonButton = stableAnchors.find((el) => !/button/i.test(el.role));
       if (nonButton)
         return nonButton;
-      if (withStableId.length > 0)
-        return withStableId[0];
-      const labelled = elements.find((el) => nonEmpty2(el.label) || nonEmpty2(el.text));
-      return labelled ?? elements[0];
+      if (stableAnchors.length > 0)
+        return stableAnchors[0];
+      const labelled = elements.find((el) => !isAlwaysPresentContainer(el) && (nonEmpty2(el.label) || nonEmpty2(el.text)));
+      return labelled ?? elements.find((el) => !isAlwaysPresentContainer(el)) ?? elements[0];
+    }
+    var ALWAYS_PRESENT_CONTAINER_ROLES = /^(XCUIElementTypeApplication|XCUIElementTypeWindow)$/;
+    var ALWAYS_PRESENT_CONTAINER_RESOURCE_IDS = /* @__PURE__ */ new Set([
+      "android:id/content",
+      "android:id/decor",
+      "android:id/action_bar_root",
+      "android:id/statusBarBackground",
+      "android:id/navigationBarBackground"
+    ]);
+    function isAlwaysPresentContainer(element) {
+      if (ALWAYS_PRESENT_CONTAINER_ROLES.test(element.role))
+        return true;
+      const resourceId = element.resourceId?.trim();
+      return !!resourceId && ALWAYS_PRESENT_CONTAINER_RESOURCE_IDS.has(resourceId);
     }
     function appendHybridFloor(actions, recording, platform3) {
       const anchor = pickLandingAnchor(recording.lastSnapshot);
@@ -9434,7 +9706,7 @@ ${statePacket}` },
       return test;
     }
     async function runMobileGeneratePhase(args) {
-      const { scenarios, driver, ctx, config, onLog, onAICall, onTestGenerated, onScreenshot } = args;
+      const { scenarios: allScenarios, driver, ctx, config, onLog, onAICall, onTestGenerated, onScreenshot, skipScenarioNames, onInfraStop } = args;
       const log2 = (line) => {
         try {
           onLog?.(line);
@@ -9449,8 +9721,16 @@ ${statePacket}` },
       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;
+      const skipSet = new Set(skipScenarioNames ?? []);
+      const scenarios = skipSet.size > 0 ? allScenarios.filter((s) => !skipSet.has(s.name)) : allScenarios;
+      if (skipSet.size > 0) {
+        log2(`Resume: skipping ${allScenarios.length - scenarios.length} already-generated scenario(s); ${scenarios.length} remaining to generate`);
+      }
       log2(`Mobile generator starting \u2014 platform: ${platform3}, provider: ${provider}, model: ${agentModel}, scenarios: ${scenarios.length}`);
       const tests = [];
+      const generatedScenarioNames = /* @__PURE__ */ new Set();
+      let consecutiveInfraFailures = 0;
+      let infraStopped = false;
       for (let i = 0; i < scenarios.length; i++) {
         const scenario = scenarios[i];
         log2(`
@@ -9471,6 +9751,7 @@ ${statePacket}` },
             targetAppId,
             log: log2
           });
+          consecutiveInfraFailures = 0;
           const test = assembleTest({ scenario, recording, ctx, platform: platform3, log: log2 });
           if (!test) {
             log2(`  scenario "${scenario.name}" produced no compilable test \u2014 skipped.`);
@@ -9487,13 +9768,31 @@ ${statePacket}` },
             log2(`  onTestGenerated callback error: ${cbErr instanceof Error ? cbErr.message : String(cbErr)}`);
           }
           tests.push(test);
+          generatedScenarioNames.add(scenario.name);
         } catch (err) {
+          if ((0, ai_retry_js_1.isAIProviderError)(err)) {
+            consecutiveInfraFailures += 1;
+            log2(`  scenario "${scenario.name}" failed \u2014 AI provider error (${consecutiveInfraFailures}/${MAX_CONSECUTIVE_INFRA_FAILURES}): ${err instanceof Error ? err.message : String(err)}`);
+            if (consecutiveInfraFailures >= MAX_CONSECUTIVE_INFRA_FAILURES) {
+              const remainingScenarioNames = scenarios.filter((s) => !generatedScenarioNames.has(s.name)).map((s) => s.name);
+              infraStopped = true;
+              log2(`
+\u26D4 Stopping mobile generation: ${consecutiveInfraFailures} consecutive AI provider failures \u2014 the provider appears overloaded/unavailable. ${tests.length}/${scenarios.length} tests generated and saved; the remaining ${remainingScenarioNames.length} scenario(s) will resume later.`);
+              try {
+                onInfraStop?.({ remainingScenarioNames, reason: "ai_rate_limit" });
+              } catch (cbErr) {
+                log2(`  onInfraStop callback error: ${cbErr instanceof Error ? cbErr.message : String(cbErr)}`);
+              }
+              break;
+            }
+            continue;
+          }
           log2(`  scenario "${scenario.name}" failed: ${err instanceof Error ? err.message : String(err)} \u2014 skipping.`);
           continue;
         }
       }
       log2(`
-Mobile generate phase complete: ${tests.length}/${scenarios.length} test(s) generated (${tests.filter((t) => t.verified).length} verified).`);
+Mobile generate phase complete: ${tests.length}/${scenarios.length} test(s) generated (${tests.filter((t) => t.verified).length} verified)${infraStopped ? " \u2014 PAUSED on AI provider overload" : ""}.`);
       return tests;
     }
   }
@@ -12772,6 +13071,10 @@ var require_snapshot_observation = __commonJS({
     var snapshot_parser_js_1 = require_snapshot_parser();
     var GENERIC_LABEL_RE = /^(input field|textbox|button|link|item|field|value|tab)$/i;
     var NOISE_LABEL_RE = /^(skip\s+to|skip\s+nav|back\s+to\s+top|cookie|accept\s+(all\s+)?cookies)$/i;
+    var DIALOG_SEGMENT_RE = /(?:^|>\s*)(?:alert)?dialog\b/i;
+    var FORM_SEGMENT_RE = /(?:^|>\s*)form\b/i;
+    var TABPANEL_SEGMENT_RE = /(?:^|>\s*)tabpanel\b/i;
+    var DIALOG_NAME_SEGMENT_RE = /(?:^|>\s*)(?:alert)?dialog:([^>]+)/i;
     var INTERACTIVE_ROLE_RE = /^(button|link|textbox|searchbox|checkbox|radio|switch|combobox|listbox|option|menuitem|tab|slider|spinbutton|textarea)$/i;
     var INTERACTIVE_ELEMENT_TYPE_RE = /^(button|link|input|textarea|select|checkbox|radio|switch|tab|combobox|listbox|option|menuitem|slider|spinbutton)$/i;
     function renderRetrievedSnapshotMemoryBlock(priorSnapshotEvidence, priorDiscoveryCheckpoints, options = {}) {
@@ -13016,10 +13319,12 @@ var require_snapshot_observation = __commonJS({
         summary
       }));
     }
+    var TEXT_DISAMBIGUATING_INPUT_TYPES = /* @__PURE__ */ new Set(["password", "text", "email", "tel", "number", "search", "url", "date", "datetime-local", "time", "month", "week"]);
     function renderCompactSnapshotBlock(page, context = {}, options = {}) {
       const metrics = page.snapshotMetrics ?? page.snapshotArtifact?.metrics;
       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 activeScope = inferActiveSnapshotScope(page);
       const ranked = rankSnapshotElements(getScopedSnapshotElements(page, activeScope), withScopeContext(context, activeScope));
       const allInteractive = ranked.filter(({ element }) => isInteractiveCandidate(element)).filter(({ element }) => {
@@ -13065,7 +13370,7 @@ var require_snapshot_observation = __commonJS({
         if (activeScope.rootRef) {
           lines.push(`  root_ref: ${yamlScalar(activeScope.rootRef)}`);
         }
-        const scopePreview = buildScopeSnapshotPreview(activeScope.scopeSnapshotText);
+        const scopePreview = buildScopeSnapshotPreview(activeScope.scopeSnapshotText, richRender);
         if (scopePreview.length > 0) {
           lines.push("  scope_snapshot_preview: |");
           for (const previewLine of scopePreview) {
@@ -13107,6 +13412,19 @@ var require_snapshot_observation = __commonJS({
           lines.push(`  - ${yamlScalar(modal)}`);
         }
       }
+      const staticMessages = page.staticMessages ?? [];
+      if (richRender && staticMessages.length > 0) {
+        const messageLimit = 6;
+        const ordered = [...staticMessages].sort((a, b) => messageRolePriority(a.role) - messageRolePriority(b.role));
+        lines.push("messages:");
+        lines.push("  # Non-interactive page text worth asserting on (validation / toast / empty-state / counts). Text is the capture instant \u2014 toasts may have dismissed since.");
+        for (const message of ordered.slice(0, messageLimit)) {
+          lines.push(`  - [${message.role}] ${yamlScalar(message.text)}`);
+        }
+        if (ordered.length > messageLimit) {
+          lines.push(`  # +${ordered.length - messageLimit} more message(s) not listed`);
+        }
+      }
       lines.push("session_state:");
       if (page.sessionState) {
         lines.push(`  authenticated: ${yamlScalar(page.sessionState.authenticated)}`);
@@ -13169,7 +13487,10 @@ var require_snapshot_observation = __commonJS({
           }
           const hasRowContext = group.rowContexts.some((rc) => !!rc);
           if (hasRowContext) {
-            lines.push('    distinguish_by_row:  # same name in different rows \u2014 scope by this text, e.g. getByRole(role, { name }).filter({ has: getByText("<row>") })');
+            const firstRowRole = group.rowRoles[0] ?? null;
+            const rowRole = firstRowRole && group.rowRoles.every((r) => r === firstRowRole) ? firstRowRole : null;
+            const scopeHint = rowRole ? `getByRole(${yamlScalar(rowRole)}).filter({ has: getByText("<row>", { exact: true }) }).getByRole(${yamlScalar(group.role)}, { name: ${yamlScalar(group.name)} })` : `locate the container by its text (getByText("<row>", { exact: true })), then getByRole(${yamlScalar(group.role)}, { name: ${yamlScalar(group.name)} }) within it`;
+            lines.push(`    distinguish_by_row:  # same name across rows \u2014 scope by the ROW/card container (not the control); nested same-role containers need an extra cell-level scope: ${scopeHint}`);
             for (let i = 0; i < group.rowContexts.length; i++) {
               const rowContext = group.rowContexts[i];
               if (!rowContext)
@@ -13199,8 +13520,13 @@ var require_snapshot_observation = __commonJS({
             lines.push(`    placeholder: ${yamlScalar(rankedElement.element.placeholder)}`);
           }
           const stateTokens = buildStateSummary(rankedElement.element);
+          const addedDisabled = richRender && !!rankedElement.element.isDisabled && !stateTokens.includes("disabled");
+          if (addedDisabled) {
+            stateTokens.unshift("disabled");
+          }
           if (stateTokens.length > 0) {
-            lines.push(`    state: [${stateTokens.map((token) => yamlScalar(token)).join(", ")}]`);
+            const note = addedDisabled ? "  # disabled = captured instant; may enable after valid input \u2014 still exercise fill\u2192submit" : "";
+            lines.push(`    state: [${stateTokens.map((token) => yamlScalar(token)).join(", ")}]${note}`);
           }
           if (rankedElement.element.containerPath) {
             lines.push(`    container_path: ${yamlScalar(rankedElement.element.containerPath)}`);
@@ -13210,6 +13536,22 @@ var require_snapshot_observation = __commonJS({
             lines.push(`    locator: ${yamlScalar((0, snapshot_parser_js_1.formatLocator)(topLocator))}`);
           }
           const enr = rankedElement.element.enrichment;
+          if (richRender && enr?.inputType && TEXT_DISAMBIGUATING_INPUT_TYPES.has(enr.inputType)) {
+            lines.push(`    type: ${yamlScalar(enr.inputType)}`);
+          }
+          if (richRender && rankedElement.element.href) {
+            lines.push(`    url: ${yamlScalar(rankedElement.element.href)}`);
+          }
+          if (richRender && rankedElement.element.value && enr?.inputType !== "password") {
+            lines.push(`    value: ${yamlScalar(rankedElement.element.value)}`);
+          }
+          const elementOptions = rankedElement.element.options ?? [];
+          if (richRender && elementOptions.length > 0) {
+            const optionLimit = 12;
+            const rendered = elementOptions.slice(0, optionLimit).map((option) => yamlScalar(option.selected ? `${option.label} (selected)` : option.label));
+            const overflow = elementOptions.length > optionLimit ? `  # +${elementOptions.length - optionLimit} more option(s)` : "";
+            lines.push(`    options: [${rendered.join(", ")}]${overflow}`);
+          }
           if (enr?.rowContext) {
             lines.push(`    row_context: ${yamlScalar(enr.rowContext)}`);
           }
@@ -13222,6 +13564,12 @@ var require_snapshot_observation = __commonJS({
             lines.push(`    visibility: [${vis.map((token) => yamlScalar(token)).join(", ")}]`);
           }
         }
+        if (richRender) {
+          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.`);
+          }
+        }
       }
       const recoveredClickables = options.recoveredClickables ?? [];
       if (recoveredClickables.length > 0) {
@@ -13378,11 +13726,11 @@ var require_snapshot_observation = __commonJS({
         score += 10;
       if (element.isExpanded)
         score += 8;
-      if (element.containerPath?.includes("dialog"))
+      if (element.containerPath && DIALOG_SEGMENT_RE.test(element.containerPath))
         score += 12;
-      if (element.containerPath?.includes("form"))
+      if (element.containerPath && FORM_SEGMENT_RE.test(element.containerPath))
         score += 10;
-      if (element.containerPath?.includes("tabpanel"))
+      if (element.containerPath && TABPANEL_SEGMENT_RE.test(element.containerPath))
         score += 8;
       if (element.inputType === "email" || element.inputType === "password" || element.inputType === "search")
         score += 6;
@@ -13453,10 +13801,10 @@ var require_snapshot_observation = __commonJS({
       }
       return merged;
     }
-    function buildScopeSnapshotPreview(scopeSnapshotText) {
+    function buildScopeSnapshotPreview(scopeSnapshotText, stripTrailingValues = false) {
       if (!scopeSnapshotText)
         return [];
-      return scopeSnapshotText.split("\n").map((line) => line.trim()).filter(Boolean).slice(0, 6);
+      return scopeSnapshotText.split("\n").map((line) => line.trim()).map((line) => stripTrailingValues ? line.replace(/\]\s*:\s.+$/, "]") : line).filter(Boolean).slice(0, 6);
     }
     function dedupeLines(lines) {
       const seen = /* @__PURE__ */ new Set();
@@ -13583,11 +13931,12 @@ var require_snapshot_observation = __commonJS({
         const key = `${role}\0${name}`;
         let group = groups.get(key);
         if (!group) {
-          group = { role, name, containers: [], rowContexts: [], refs: [] };
+          group = { role, name, containers: [], rowContexts: [], rowRoles: [], refs: [] };
           groups.set(key, group);
         }
         group.containers.push(element.containerPath ?? null);
         group.rowContexts.push(element.enrichment?.rowContext ?? null);
+        group.rowRoles.push(element.enrichment?.rowRole ?? null);
         group.refs.push(element.ref ?? null);
       }
       return [...groups.values()].filter((group) => group.containers.length > 1);
@@ -13597,7 +13946,7 @@ var require_snapshot_observation = __commonJS({
       for (const element of elements) {
         const role = element.role?.toLowerCase() ?? "";
         const elementType = element.elementType?.toLowerCase() ?? "";
-        const isDialog = role === "dialog" || elementType === "dialog" || (element.containerPath?.toLowerCase().includes("dialog:") ?? false);
+        const isDialog = role === "dialog" || elementType === "dialog" || DIALOG_NAME_SEGMENT_RE.test(element.containerPath ?? "");
         if (!isDialog)
           continue;
         const hint = qualifyElementLabel(element) ?? dialogNameFromContainerPath(element.containerPath) ?? element.label ?? element.testId ?? "dialog";
@@ -13610,7 +13959,7 @@ var require_snapshot_observation = __commonJS({
     function dialogNameFromContainerPath(containerPath) {
       if (!containerPath)
         return null;
-      const match = containerPath.match(/dialog:([^>]+)/i);
+      const match = containerPath.match(DIALOG_NAME_SEGMENT_RE);
       return match ? match[1].trim() : null;
     }
     function renderObservationCue(observation) {
@@ -13619,6 +13968,13 @@ var require_snapshot_observation = __commonJS({
       const base2 = observation.outcomeType === "SUCCESS" && outcome ? outcome : `${action} -> ${outcome || observation.outcomeType}`;
       return base2.length > 120 ? `${base2.slice(0, 117)}...` : base2;
     }
+    function messageRolePriority(role) {
+      if (role === "alert")
+        return 0;
+      if (role === "status")
+        return 1;
+      return 2;
+    }
     function yamlScalar(value) {
       if (value == null || value === "")
         return "null";
@@ -20167,7 +20523,10 @@ ${testOpen}`;
           pressed: se.pressed,
           headingLevel: se.headingLevel,
           currentState: se.currentState,
-          containerPath: se.containerPath || void 0
+          containerPath: se.containerPath || void 0,
+          href: se.href || void 0,
+          value: se.value || void 0,
+          options: se.options && se.options.length > 0 ? se.options : void 0
         }));
         const structuredPage = {
           route: pageUrl || "/",
@@ -20175,6 +20534,7 @@ ${testOpen}`;
           pageType: "unknown",
           elements: collectedElements,
           formGroups: parsed.formGroups,
+          staticMessages: parsed.staticMessages.length > 0 ? parsed.staticMessages : void 0,
           snapshotMetrics: {
             rawLineCount: parsed.rawLineCount,
             parsedElementLineCount: parsed.parsedElementLineCount,
@@ -21741,7 +22101,7 @@ Do NOT assert that the button/tab/heading you interacted with is merely visible
       let stopped;
       const agentModel = options?.modelOverride ? (0, ai_provider_js_1.resolveModelForTask)(options.modelOverride, "agent") : (0, ai_provider_js_1.getModel)("agent");
       const auditGroupId = `generate-${(0, crypto_1.randomUUID)().slice(0, 8)}`;
-      const aiClient = options?.modelOverride ? (0, ai_provider_js_1.getClientForModel)(options.modelOverride) : (0, ai_provider_js_1.getAIClient)();
+      const aiClient = options?.modelOverride ? (0, ai_provider_js_1.getRunnerClientForModel)(options.modelOverride) : (0, ai_provider_js_1.getRunnerAIClient)();
       const credentials = variableContext.allTestVariables ?? variableContext.publicTestVariables;
       logs2.push(`Phase 3 \u2014 Generate: ${(plan.scenarios ?? []).length} scenarios, max ${maxTests} tests`);
       logs2.push(`Model: ${agentModel}`);
@@ -235706,7 +236066,7 @@ var require_mcp_healer = __commonJS({
       messages.push(system, firstUser, { role: "user", content: lines.join("\n") }, ...tail);
     }
     var DEFAULT_MAX_SCRIPT_HEAL_ATTEMPTS = 6;
-    function readPositiveIntEnv(env, name, fallback) {
+    function readPositiveIntEnv2(env, name, fallback) {
       const raw = env[name]?.trim();
       if (!raw || !/^\d+$/.test(raw))
         return fallback;
@@ -235714,7 +236074,7 @@ var require_mcp_healer = __commonJS({
       return Number.isSafeInteger(parsed) && parsed > 0 ? parsed : fallback;
     }
     function getScriptHealMaxAttempts(env = process.env) {
-      return readPositiveIntEnv(env, "MCP_HEAL_SCRIPT_MAX_ATTEMPTS", DEFAULT_MAX_SCRIPT_HEAL_ATTEMPTS);
+      return readPositiveIntEnv2(env, "MCP_HEAL_SCRIPT_MAX_ATTEMPTS", DEFAULT_MAX_SCRIPT_HEAL_ATTEMPTS);
     }
     exports.SCRIPT_HEAL_SYSTEM_PROMPT = `You are a QA engineer fixing a failing Playwright UI test. You will receive the test code, the error message, step-level results, and a screenshot of the failure state.
 
@@ -236050,7 +236410,7 @@ ${lines.join("\n")}
       const landingViolation = (tags ?? []).includes("@landing-violation");
       const agentModel = modelOverride ? (0, ai_provider_js_1.resolveModelForTask)(modelOverride, "strong") : (0, ai_provider_js_1.getModel)("strong");
       const provider = modelOverride ? (0, ai_provider_js_1.getProviderForModel)(modelOverride) : (0, ai_provider_js_1.getAIProvider)();
-      const aiClient = options.aiClient ?? (modelOverride ? (0, ai_provider_js_1.getClientForModel)(modelOverride) : (0, ai_provider_js_1.getAIClient)());
+      const aiClient = options.aiClient ?? (modelOverride ? (0, ai_provider_js_1.getRunnerClientForModel)(modelOverride) : (0, ai_provider_js_1.getRunnerAIClient)());
       const runNativeTest = options.runNativeTest ?? playwright_native_js_1.executeTestViaNativePlaywright;
       const modelSupportsVision = /gpt-4o|claude-3|claude-4|minimax|grok/i.test(agentModel ?? "");
       const groupId = `script-heal-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
@@ -236872,10 +237232,10 @@ ${(verifyResult.logs ?? "").slice(0, 2e3)}`;
     var DEFAULT_MAX_PHASE2_ITERATIONS = 4;
     var DEFAULT_MAX_MCP_EXPLORE_ITERATIONS = 25;
     function getMcpHealPhase2MaxIterations(env = process.env) {
-      return readPositiveIntEnv(env, "MCP_HEAL_PHASE2_MAX_ITERATIONS", DEFAULT_MAX_PHASE2_ITERATIONS);
+      return readPositiveIntEnv2(env, "MCP_HEAL_PHASE2_MAX_ITERATIONS", DEFAULT_MAX_PHASE2_ITERATIONS);
     }
     function getMcpHealExploreMaxIterations(env = process.env) {
-      return readPositiveIntEnv(env, "MCP_HEAL_EXPLORE_MAX_ITERATIONS", DEFAULT_MAX_MCP_EXPLORE_ITERATIONS);
+      return readPositiveIntEnv2(env, "MCP_HEAL_EXPLORE_MAX_ITERATIONS", DEFAULT_MAX_MCP_EXPLORE_ITERATIONS);
     }
     var DEFAULT_MCP_HEAL_MAX_WALL_CLOCK_MS = 10 * 60 * 1e3;
     var DEFAULT_MCP_HEAL_MAX_TOTAL_AI_CALLS = 60;
@@ -236927,7 +237287,7 @@ Only explore the failing page and the area around the broken step.`;
       let lastVideo;
       const agentModel = modelOverride ? (0, ai_provider_js_1.resolveModelForTask)(modelOverride, "agent") : (0, ai_provider_js_1.getModel)("agent");
       const provider = modelOverride ? (0, ai_provider_js_1.getProviderForModel)(modelOverride) : (0, ai_provider_js_1.getAIProvider)();
-      const aiClient = options?.phase2Harness?.aiClient ?? (modelOverride ? (0, ai_provider_js_1.getClientForModel)(modelOverride) : (0, ai_provider_js_1.getAIClient)());
+      const aiClient = options?.phase2Harness?.aiClient ?? (modelOverride ? (0, ai_provider_js_1.getRunnerClientForModel)(modelOverride) : (0, ai_provider_js_1.getRunnerAIClient)());
       const runPhase2NativeTest = options?.phase2Harness?.runNativeTest ?? playwright_native_js_1.executeTestViaNativePlaywright;
       const modelSupportsVision = /gpt-4o|claude-3|claude-4|minimax|grok/i.test(agentModel ?? "");
       const groupId = `phase2-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
@@ -237617,7 +237977,10 @@ Fix the syntax error and provide ONLY the complete corrected Playwright test as
                         pressed: se.pressed,
                         headingLevel: se.headingLevel,
                         currentState: se.currentState,
-                        containerPath: se.containerPath || void 0
+                        containerPath: se.containerPath || void 0,
+                        href: se.href || void 0,
+                        value: se.value || void 0,
+                        options: se.options && se.options.length > 0 ? se.options : void 0
                       }));
                       const structuredPage = {
                         route: pageUrl || "/",
@@ -237625,6 +237988,7 @@ Fix the syntax error and provide ONLY the complete corrected Playwright test as
                         pageType: "unknown",
                         elements: collectedElements,
                         formGroups: parsed.formGroups,
+                        staticMessages: parsed.staticMessages.length > 0 ? parsed.staticMessages : void 0,
                         snapshotMetrics: {
                           rawLineCount: parsed.rawLineCount,
                           parsedElementLineCount: parsed.parsedElementLineCount,
@@ -238061,7 +238425,7 @@ ${testBlocks}
   - By iteration ${Math.floor(maxIterations * 0.3)}: you should have completed 1-2 tests
   - By iteration ${Math.floor(maxIterations * 0.7)}: you should be past the halfway point
   - At iteration ${Math.floor(maxIterations * 0.9)}: wrap up and call finish_capture`;
-        const aiClient = modelOverride ? (0, ai_provider_js_1.getClientForModel)(modelOverride) : (0, ai_provider_js_1.getAIClient)();
+        const aiClient = modelOverride ? (0, ai_provider_js_1.getRunnerClientForModel)(modelOverride) : (0, ai_provider_js_1.getRunnerAIClient)();
         const messages = [
           { role: "system", content: systemPrompt },
           { role: "user", content: "Start executing the tests. Navigate to the base URL and begin with Test 1." }
@@ -238244,7 +238608,10 @@ ${testBlocks}
                     pressed: se.pressed,
                     headingLevel: se.headingLevel,
                     currentState: se.currentState,
-                    containerPath: se.containerPath || void 0
+                    containerPath: se.containerPath || void 0,
+                    href: se.href || void 0,
+                    value: se.value || void 0,
+                    options: se.options && se.options.length > 0 ? se.options : void 0
                   }));
                   const structuredPage = {
                     route: pageUrl || "/",
@@ -238252,6 +238619,7 @@ ${testBlocks}
                     pageType: "unknown",
                     elements: collectedElements,
                     formGroups: parsed.formGroups,
+                    staticMessages: parsed.staticMessages.length > 0 ? parsed.staticMessages : void 0,
                     snapshotMetrics: {
                       rawLineCount: parsed.rawLineCount,
                       parsedElementLineCount: parsed.parsedElementLineCount,
@@ -300041,8 +300409,9 @@ var require_capture_page_normalizer = __commonJS({
       let snapshotElements = [];
       let formGroups = [];
       let snapshotMetrics;
+      let staticMessages;
       if (normalizedSnapshotResult.snapshotText) {
-        const parsed = (0, snapshot_parser_js_1.parseSnapshot)(normalizedSnapshotResult.snapshotText);
+        const parsed = (0, snapshot_parser_js_1.parseSnapshot)(normalizedSnapshotResult.snapshotText, { richParse: context.richParse });
         snapshotMetrics = {
           rawLineCount: parsed.rawLineCount,
           parsedElementLineCount: parsed.parsedElementLineCount,
@@ -300071,9 +300440,13 @@ var require_capture_page_normalizer = __commonJS({
           pressed: se.pressed,
           headingLevel: se.headingLevel,
           currentState: se.currentState,
-          containerPath: se.containerPath || void 0
+          containerPath: se.containerPath || void 0,
+          href: se.href || void 0,
+          value: se.value || void 0,
+          options: se.options && se.options.length > 0 ? se.options : void 0
         }));
         formGroups = parsed.formGroups;
+        staticMessages = parsed.staticMessages.length > 0 ? parsed.staticMessages : void 0;
       }
       const aiElements = Array.isArray(toolArgs.elements) ? toolArgs.elements.map(normalizeAiElement) : [];
       const noYamlKinds = /* @__PURE__ */ new Set(["missing", "timeout", "error", "empty"]);
@@ -300169,6 +300542,7 @@ var require_capture_page_normalizer = __commonJS({
         } : void 0,
         readinessSignals,
         viewportHints,
+        staticMessages,
         provenCommands: provenCmds,
         observations: rawObservations,
         routeCorrected,
@@ -300477,6 +300851,10 @@ var require_perception_enricher = __commonJS({
       const e = {};
       if (p.rowContext)
         e.rowContext = p.rowContext;
+      if (p.rowContext && p.rowRole)
+        e.rowRole = p.rowRole;
+      if (p.inputType)
+        e.inputType = p.inputType;
       if (p.position && p.position !== "in-view")
         e.position = p.position;
       if (p.occluded)
@@ -300726,6 +301104,23 @@ var require_perception_enricher = __commonJS({
         const cls = (el.getAttribute("class") || "").toLowerCase();
         return /(^|[\s_-])(card|row|item|listitem|cell|tile)([\s_-]|$)/.test(cls);
       };
+      const rowRoleOf = (el) => {
+        const explicit = (el.getAttribute("role") || "").toLowerCase().trim();
+        if (explicit) {
+          return explicit === "row" || explicit === "listitem" || explicit === "article" || explicit === "option" ? explicit : null;
+        }
+        const tag = el.tagName;
+        if (tag === "TR") {
+          const tbl = el.closest("table");
+          const tblRole = tbl ? (tbl.getAttribute("role") || "").toLowerCase().trim() : "";
+          return tblRole === "presentation" || tblRole === "none" ? null : "row";
+        }
+        if (tag === "LI")
+          return el.closest('ul:not([role]),ol:not([role]),menu:not([role]),[role="list"]') ? "listitem" : null;
+        if (tag === "ARTICLE")
+          return "article";
+        return null;
+      };
       const rowContextOf = (el, ownNameLower) => {
         let cur = el.parentElement;
         let depth = 0;
@@ -300744,7 +301139,7 @@ var require_perception_enricher = __commonJS({
             txt = txt.slice(0, 80);
             const low = txt.toLowerCase();
             if (txt && low !== ownNameLower && low.length > 1)
-              return txt;
+              return { text: txt, role: rowRoleOf(cur) };
             return null;
           }
           cur = cur.parentElement;
@@ -300834,11 +301229,14 @@ var require_perception_enricher = __commonJS({
         const name = accName(el);
         const lname = lower(name);
         const rect = vis.rect;
+        const rc = rowContextOf(el, lname);
         out.push({
           domOrder: myOrder,
           roleClass: roleClassOf(tag, roleAttr, inputType),
           name: lname,
-          rowContext: rowContextOf(el, lname),
+          rowContext: rc ? rc.text : null,
+          rowRole: rc ? rc.role : null,
+          inputType: inputType || null,
           position: positionOf(rect),
           occluded: occlusionOf(el, rect),
           cursorPointer,
@@ -300875,11 +301273,14 @@ var require_perception_enricher = __commonJS({
           if (!name)
             continue;
           const lname = lower(name);
+          const rc = rowContextOf(el, lname);
           out.push({
             domOrder: order++,
             roleClass: "button",
             name: lname,
-            rowContext: rowContextOf(el, lname),
+            rowContext: rc ? rc.text : null,
+            rowRole: rc ? rc.role : null,
+            inputType: null,
             position: "in-view",
             occluded: false,
             cursorPointer: true,
@@ -301381,7 +301782,7 @@ var require_discover_explorer = __commonJS({
     var DEFAULT_MAX_EXPLORE_ITERATIONS_DEEP = 100;
     var DEFAULT_MAX_EXPLORE_ITERATIONS_SURVEY = 100;
     var DEFAULT_MAX_EXPLORE_ITERATIONS_INCREMENTAL = 40;
-    function readPositiveIntEnv(env, name, fallback) {
+    function readPositiveIntEnv2(env, name, fallback) {
       const raw = env[name]?.trim();
       if (!raw || !/^\d+$/.test(raw))
         return fallback;
@@ -301512,15 +301913,15 @@ var require_discover_explorer = __commonJS({
     }
     function getMaxIterations(mode, incremental, env = process.env) {
       if (mode === "survey" && incremental) {
-        return readPositiveIntEnv(env, "DISCOVERY_EXPLORE_MAX_ITERATIONS_INCREMENTAL", DEFAULT_MAX_EXPLORE_ITERATIONS_INCREMENTAL);
+        return readPositiveIntEnv2(env, "DISCOVERY_EXPLORE_MAX_ITERATIONS_INCREMENTAL", DEFAULT_MAX_EXPLORE_ITERATIONS_INCREMENTAL);
       }
       if (mode === "survey") {
-        return readPositiveIntEnv(env, "DISCOVERY_EXPLORE_MAX_ITERATIONS_SURVEY", DEFAULT_MAX_EXPLORE_ITERATIONS_SURVEY);
+        return readPositiveIntEnv2(env, "DISCOVERY_EXPLORE_MAX_ITERATIONS_SURVEY", DEFAULT_MAX_EXPLORE_ITERATIONS_SURVEY);
       }
       if (mode === "deep") {
-        return readPositiveIntEnv(env, "DISCOVERY_EXPLORE_MAX_ITERATIONS_DEEP", DEFAULT_MAX_EXPLORE_ITERATIONS_DEEP);
+        return readPositiveIntEnv2(env, "DISCOVERY_EXPLORE_MAX_ITERATIONS_DEEP", DEFAULT_MAX_EXPLORE_ITERATIONS_DEEP);
       }
-      return readPositiveIntEnv(env, "DISCOVERY_EXPLORE_MAX_ITERATIONS_DEFAULT", DEFAULT_MAX_EXPLORE_ITERATIONS_DEFAULT);
+      return readPositiveIntEnv2(env, "DISCOVERY_EXPLORE_MAX_ITERATIONS_DEFAULT", DEFAULT_MAX_EXPLORE_ITERATIONS_DEFAULT);
     }
     function updatePendingRouteScreenshot(pending, { imageData, detectedRoute, fallbackRoute }) {
       if (imageData) {
@@ -302246,7 +302647,7 @@ ${inboxPromptBlock}`;
         const browserCreds = variableContext.allTestVariables ?? variableContext.publicTestVariables;
         const { secrets: browserSecretsForHint } = (0, credential_tools_js_1.partitionTestVariables)(browserCreds);
         const hasLoginCredentials = Object.keys(browserSecretsForHint).length > 0;
-        const aiClient = options?.modelOverride ? (0, ai_provider_js_1.getClientForModel)(options.modelOverride) : (0, ai_provider_js_1.getAIClient)();
+        const aiClient = options?.modelOverride ? (0, ai_provider_js_1.getRunnerClientForModel)(options.modelOverride) : (0, ai_provider_js_1.getRunnerAIClient)();
         const isDeepMode = options?.mode === "deep";
         const maxIterations = config?.maxIterationsOverride && config.maxIterationsOverride > 0 ? config.maxIterationsOverride : getMaxIterations(options?.mode ?? "full", options?.incremental);
         const configKeepTail = isDeepMode ? Math.ceil(ctxConfig.keepTail * 1.5) : ctxConfig.keepTail;
@@ -304785,7 +305186,7 @@ var require_auth_capture_run = __commonJS({
     var scrub_credentials_js_1 = require_scrub_credentials();
     var credential_tools_js_1 = require_credential_tools();
     var DEFAULT_MAX_LOGIN_CAPTURE_ITERATIONS = 12;
-    function readPositiveIntEnv(env, name, fallback) {
+    function readPositiveIntEnv2(env, name, fallback) {
       const raw = env[name]?.trim();
       if (!raw || !/^\d+$/.test(raw))
         return fallback;
@@ -304793,7 +305194,7 @@ var require_auth_capture_run = __commonJS({
       return Number.isSafeInteger(parsed) && parsed > 0 ? parsed : fallback;
     }
     function getLoginCaptureMaxIterations(env = process.env) {
-      return readPositiveIntEnv(env, "AUTH_CAPTURE_LOGIN_MAX_ITERATIONS", DEFAULT_MAX_LOGIN_CAPTURE_ITERATIONS);
+      return readPositiveIntEnv2(env, "AUTH_CAPTURE_LOGIN_MAX_ITERATIONS", DEFAULT_MAX_LOGIN_CAPTURE_ITERATIONS);
     }
     var CAPTURE_RATE_LIMIT_MAX_RETRIES = 2;
     var CAPTURE_RATE_LIMIT_MAX_DELAY_MS = 8e3;
@@ -305076,7 +305477,7 @@ ${keyLines || "- (none provided)"}
     }
     var DEFAULT_MAX_REGISTER_CAPTURE_ITERATIONS = 18;
     function getRegisterCaptureMaxIterations(env = process.env) {
-      return readPositiveIntEnv(env, "AUTH_CAPTURE_REGISTER_MAX_ITERATIONS", DEFAULT_MAX_REGISTER_CAPTURE_ITERATIONS);
+      return readPositiveIntEnv2(env, "AUTH_CAPTURE_REGISTER_MAX_ITERATIONS", DEFAULT_MAX_REGISTER_CAPTURE_ITERATIONS);
     }
     function buildRegisterCaptureSystemPrompt(baseUrl, availableKeys, maxIterations = getRegisterCaptureMaxIterations()) {
       const keyLines = availableKeys.map((k) => `- \`${k}\``).join("\n");
@@ -311306,6 +311707,7 @@ var require_mobile_exploration_state = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.MobileExplorationState = void 0;
     exports.deriveScreenId = deriveScreenId;
+    var mobile_observation_js_1 = require_mobile_observation();
     var DEFAULT_STALE_THRESHOLD = 4;
     function deriveScreenId(signal) {
       const namespace = signal.activity ?? signal.bundleId;
@@ -311531,21 +311933,33 @@ var require_mobile_exploration_state = __commonJS({
        * Build the planner evidence shape: one `CollectedPageData` per screen, with
        * the screen-id carried in BOTH `route` (the on-the-wire positional field the
        * server keys screenshots by) AND the explicit `screenId` field (per the
-       * Phase-0 `CollectedPageData.screenId` contract). `elements` is left empty —
-       * the web-shaped `CollectedPageElement[]` is not the mobile element shape;
-       * the mobile planner reads screen identity + names from this evidence and the
-       * richer per-element data flows through the generator's own re-drive, not
-       * through this map. Insertion order matches first-seen order.
+       * Phase-0 `CollectedPageData.screenId` contract). `elements` are mapped from
+       * the screen's parsed actionable elements into the platform-neutral
+       * `CollectedPageElement[]` shape the server persists as SiteElements — without
+       * this, mobile screens land with zero elements (coverage always 0%, no element
+       * intelligence). `triggersNavigation` is derived from transition-source
+       * membership: an element is flagged when its ref drove a transition FROM this
+       * screen. Insertion order matches first-seen order.
        */
       buildInMemoryScreenMap() {
         const pages = [];
         const ordered = [...this.screens.values()].sort((a, b) => a.firstSeenIteration - b.firstSeenIteration);
+        const navRefsByScreen = /* @__PURE__ */ new Map();
+        for (const transition of this.transitions) {
+          if (!transition.viaRef)
+            continue;
+          const set = navRefsByScreen.get(transition.fromScreenId) ?? /* @__PURE__ */ new Set();
+          set.add(transition.viaRef);
+          navRefsByScreen.set(transition.fromScreenId, set);
+        }
         for (const state2 of ordered) {
           const page = {
             route: state2.screenId,
             screenId: state2.screenId,
             pageType: state2.screenType ?? "UNKNOWN",
-            elements: []
+            elements: (0, mobile_observation_js_1.buildCollectedElementsForScreen)(state2.elements, {
+              navigationRefs: navRefsByScreen.get(state2.screenId)
+            })
           };
           if (state2.screenName) {
             page.title = state2.screenName;
@@ -311575,14 +311989,51 @@ var require_mobile_discovery_agent = __commonJS({
   "../runner-core/dist/services/mobile/mobile-discovery-agent.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.getMobileExploreBudget = getMobileExploreBudget;
     exports.runMobileDiscoveryOnRunner = runMobileDiscoveryOnRunner2;
     var mobile_explorer_js_1 = require_mobile_explorer();
     var mobile_discovery_prompts_js_1 = require_mobile_discovery_prompts();
     var mobile_generator_js_1 = require_mobile_generator();
     var mobile_exploration_state_js_1 = require_mobile_exploration_state();
     var discover_planner_js_1 = require_discover_planner();
-    var EXPLORE_BUDGET_DEEP = 60;
-    var EXPLORE_BUDGET_SURVEY = 40;
+    function checkpointErrorMessage(err) {
+      return err instanceof Error ? err.message : String(err);
+    }
+    function isTerminalDiscoveryCheckpointError(err) {
+      const message = checkpointErrorMessage(err);
+      return /Discovery plan checkpoint rejected|Discovery run is .*not RUNNING|not RUNNING|cancelled/i.test(message);
+    }
+    var MOBILE_EXPLORE_BUDGET_SURVEY_FIRST = 90;
+    var MOBILE_EXPLORE_BUDGET_SURVEY_INCREMENTAL = 40;
+    var MOBILE_EXPLORE_BUDGET_DEEP = 60;
+    var MOBILE_EXPLORE_BUDGET_FULL = 90;
+    function readPositiveIntEnv2(name, fallback, env = process.env) {
+      const raw = env[name]?.trim();
+      if (!raw || !/^\d+$/.test(raw))
+        return fallback;
+      const parsed = Number(raw);
+      return Number.isSafeInteger(parsed) && parsed > 0 ? parsed : fallback;
+    }
+    function getMobileExploreBudget(mode, incremental, env = process.env) {
+      if (mode === "deep")
+        return readPositiveIntEnv2("MOBILE_EXPLORE_MAX_ITERATIONS_DEEP", MOBILE_EXPLORE_BUDGET_DEEP, env);
+      if (mode === "full")
+        return readPositiveIntEnv2("MOBILE_EXPLORE_MAX_ITERATIONS_FULL", MOBILE_EXPLORE_BUDGET_FULL, env);
+      if (incremental) {
+        return readPositiveIntEnv2("MOBILE_EXPLORE_MAX_ITERATIONS_SURVEY_INCREMENTAL", MOBILE_EXPLORE_BUDGET_SURVEY_INCREMENTAL, env);
+      }
+      return readPositiveIntEnv2("MOBILE_EXPLORE_MAX_ITERATIONS_SURVEY", MOBILE_EXPLORE_BUDGET_SURVEY_FIRST, env);
+    }
+    function compactExistingScreens(siteMap) {
+      if (!siteMap || !Array.isArray(siteMap.pages) || siteMap.pages.length === 0)
+        return void 0;
+      const screens = siteMap.pages.filter((p) => typeof p.route === "string" && p.route.trim().length > 0).map((p) => ({
+        screenId: p.route,
+        ...p.title ? { name: p.title } : {},
+        ...p.pageType ? { screenType: p.pageType } : {}
+      }));
+      return screens.length > 0 ? screens : void 0;
+    }
     function platformForMedium(medium) {
       return medium === "IOS_NATIVE" ? "IOS" : "ANDROID";
     }
@@ -311601,6 +312052,9 @@ var require_mobile_discovery_agent = __commonJS({
         // 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.
+        // D-D6 — pageScreenshotKeys is a small screen-id → storage-key map (NOT base64),
+        // so it DOES ride the checkpoint: the server links each key to SitePage.screenshotKey.
+        ...explore.pageScreenshotKeys && Object.keys(explore.pageScreenshotKeys).length > 0 ? { pageScreenshotKeys: explore.pageScreenshotKeys } : {},
         exploreStats: explore.exploreStats,
         healthObservations: explore.healthObservations
       };
@@ -311615,6 +312069,7 @@ var require_mobile_discovery_agent = __commonJS({
       const onLog = callbacks?.onLog;
       const onAICall = callbacks?.onAICall;
       const onScreenshot = callbacks?.onScreenshot;
+      const onScreenshotUpload = callbacks?.onScreenshotUpload;
       const runExplore = callbacks?.runExplore ?? mobile_explorer_js_1.runMobileExplorePhase;
       const runPlan = callbacks?.runPlan ?? mobile_discovery_prompts_js_1.runMobileAIPlanner;
       const runGenerate = callbacks?.runGenerate ?? mobile_generator_js_1.runMobileGeneratePhase;
@@ -311641,15 +312096,77 @@ var require_mobile_discovery_agent = __commonJS({
         elementsFound: 0,
         transitionsFound: 0
       };
+      const resumeSavedScenarios = ctx.resume?.savedPlan?.scenarios ?? [];
+      const isPlanReuseResume = mode !== "survey" && resumeSavedScenarios.length > 0;
       try {
+        if (isPlanReuseResume) {
+          const alreadyGenerated = ctx.resume?.alreadyGeneratedScenarioNames ?? [];
+          log2(`
+\u2500\u2500 Resume (plan-reuse): ${resumeSavedScenarios.length} saved scenario(s); ${alreadyGenerated.length} already generated. Skipping explore + plan; generating only the remainder. \u2500\u2500`);
+          const scenarios2 = resumeSavedScenarios;
+          const plans2 = toPlans(scenarios2);
+          if (callbacks?.onPlanReady) {
+            try {
+              await callbacks.onPlanReady({ scenarios: scenarios2, featureGroups: void 0, fallbackUsed: false });
+              log2("Plan checkpoint: reused scenario plan re-POSTed to server");
+            } catch (err) {
+              const message = checkpointErrorMessage(err);
+              if (isTerminalDiscoveryCheckpointError(err)) {
+                log2(`Plan checkpoint rejected for inactive discovery run: ${message}`);
+                throw err;
+              }
+              log2(`Plan checkpoint POST failed (non-fatal): ${message}`);
+            }
+          }
+          let paused = false;
+          let pauseReason;
+          let remainingScenarios;
+          const tests2 = await runGenerate({
+            scenarios: scenarios2,
+            driver,
+            ctx,
+            onLog: (line) => log2(line),
+            onAICall,
+            onScreenshot,
+            onTestGenerated: (test) => callbacks?.onTestGenerated?.(test, { phase: "verified" }),
+            skipScenarioNames: alreadyGenerated,
+            onInfraStop: (info) => {
+              paused = true;
+              pauseReason = info.reason;
+              remainingScenarios = info.remainingScenarioNames;
+            }
+          });
+          const duration2 = (Date.now() - startTime) / 1e3;
+          const summary2 = `Mobile resume complete: generated ${tests2.length} test(s) from ${scenarios2.length} saved scenario(s) in ${duration2.toFixed(1)}s${paused ? " \u2014 PAUSED again on AI provider overload" : ""}`;
+          log2(`
+=== Mobile Discovery Resume Complete (${duration2.toFixed(1)}s) ===`);
+          log2(summary2);
+          return {
+            collectedPages: [],
+            collectedTransitions: [],
+            tests: tests2,
+            plans: plans2,
+            scenarios: scenarios2.length > 0 ? scenarios2 : void 0,
+            logs: logs2.join("\n"),
+            screenshots,
+            summary: summary2,
+            exploreStats: { pagesDiscovered: 0, pagesVisited: 0, elementsFound: 0, transitionsFound: 0 },
+            duration: duration2,
+            mode,
+            ...paused ? { paused: true, pauseReason, remainingScenarios } : {}
+            // apiCalls intentionally UNSET — CHUNK K (runner.ts) merges them.
+          };
+        }
         log2("\n\u2500\u2500 Phase 1: EXPLORE \u2500\u2500");
         const state2 = new mobile_exploration_state_js_1.MobileExplorationState();
-        const maxIterations = mode === "deep" ? EXPLORE_BUDGET_DEEP : EXPLORE_BUDGET_SURVEY;
+        const maxIterations = getMobileExploreBudget(mode, ctx.incremental);
+        const existingScreens = compactExistingScreens(ctx.existingSiteMap);
         const explore = await runExplore({
           ctx,
           driver,
           state: state2,
           config: { maxIterations },
+          existingScreens,
           onLog: (line) => log2(line),
           onAICall,
           onScreenshot: (base64) => {
@@ -311659,7 +312176,8 @@ var require_mobile_discovery_agent = __commonJS({
               onScreenshot?.(base64);
             } catch {
             }
-          }
+          },
+          onScreenshotUpload
         });
         const collectedTransitions = toCollectedTransitions(explore);
         partialCollectedPages = explore.collectedPages;
@@ -311711,14 +312229,22 @@ Plan: ${planResult.scenarios.length} scenarios, ${planResult.featureGroups.lengt
         const plans = toPlans(scenarios);
         const coverageGaps = planResult.coverageGaps && planResult.coverageGaps.length > 0 ? planResult.coverageGaps : void 0;
         if (callbacks?.onPlanReady) {
-          await callbacks.onPlanReady({
-            scenarios,
-            featureGroups,
-            fallbackUsed: planResult.fallbackUsed ?? false,
-            fallbackReason: planResult.fallbackReason
-          }).then(() => log2("Plan checkpoint: scenario plan POSTed to server")).catch((err) => {
-            log2(`Plan checkpoint POST failed (non-fatal): ${err instanceof Error ? err.message : String(err)}`);
-          });
+          try {
+            await callbacks.onPlanReady({
+              scenarios,
+              featureGroups,
+              fallbackUsed: planResult.fallbackUsed ?? false,
+              fallbackReason: planResult.fallbackReason
+            });
+            log2("Plan checkpoint: scenario plan POSTed to server");
+          } catch (err) {
+            const message = checkpointErrorMessage(err);
+            if (isTerminalDiscoveryCheckpointError(err)) {
+              log2(`Plan checkpoint rejected for inactive discovery run: ${message}`);
+              throw err;
+            }
+            log2(`Plan checkpoint POST failed (non-fatal): ${message}`);
+          }
         }
         if (isSurvey) {
           const duration2 = (Date.now() - startTime) / 1e3;
@@ -311752,6 +312278,9 @@ Plan: ${planResult.scenarios.length} scenarios, ${planResult.featureGroups.lengt
           };
         }
         log2("\n\u2500\u2500 Phase 3: GENERATE \u2500\u2500");
+        let generatePaused = false;
+        let generatePauseReason;
+        let generateRemainingScenarios;
         const tests = await runGenerate({
           scenarios,
           driver,
@@ -311759,7 +312288,15 @@ Plan: ${planResult.scenarios.length} scenarios, ${planResult.featureGroups.lengt
           onLog: (line) => log2(line),
           onAICall,
           onScreenshot,
-          onTestGenerated: (test) => callbacks?.onTestGenerated?.(test, { phase: "verified" })
+          onTestGenerated: (test) => callbacks?.onTestGenerated?.(test, { phase: "verified" }),
+          // Legacy resume (no saved plan): still skip scenarios already generated by the
+          // paused run so the AI isn't re-invoked for them. Undefined on a fresh run.
+          skipScenarioNames: ctx.resume?.alreadyGeneratedScenarioNames,
+          onInfraStop: (info) => {
+            generatePaused = true;
+            generatePauseReason = info.reason;
+            generateRemainingScenarios = info.remainingScenarioNames;
+          }
         });
         const generateElapsed = ((Date.now() - startTime) / 1e3).toFixed(1);
         log2(`
@@ -311775,7 +312312,7 @@ Generation complete: ${tests.length} tests generated (${generateElapsed}s elapse
           };
         }
         const duration = (Date.now() - startTime) / 1e3;
-        const summary = `Mobile discovery complete: explored ${explore.exploreStats.pagesDiscovered} screens, planned ${scenarios.length} scenarios, generated ${tests.length} tests in ${duration.toFixed(1)}s`;
+        const summary = `Mobile discovery complete: explored ${explore.exploreStats.pagesDiscovered} screens, planned ${scenarios.length} scenarios, generated ${tests.length} tests in ${duration.toFixed(1)}s${generatePaused ? " \u2014 PAUSED on AI provider overload (resumable)" : ""}`;
         log2(`
 === Mobile Discovery Pipeline Complete (${duration.toFixed(1)}s) ===`);
         log2(summary);
@@ -311800,7 +312337,11 @@ Generation complete: ${tests.length} tests generated (${generateElapsed}s elapse
           summary,
           exploreStats: explore.exploreStats,
           duration,
-          mode
+          mode,
+          // D-D4 — a circuit-breaker trip PAUSES the run (resumable) instead of
+          // finalizing COMPLETED/FAILED. The server's isDiscoveryPaused reads these
+          // (forwarded by runner.ts buildFinalBody, byte-identical to the web path).
+          ...generatePaused ? { paused: true, pauseReason: generatePauseReason, remainingScenarios: generateRemainingScenarios } : {}
           // apiCalls intentionally UNSET — CHUNK K (runner.ts) merges them.
         };
       } catch (fatalErr) {
@@ -311846,6 +312387,7 @@ var require_discover_agent = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.runMobileDiscoveryOnRunner = exports.buildInMemorySiteMap = void 0;
     exports.runCanvasPreflight = runCanvasPreflight;
+    exports.getFatalExploreError = getFatalExploreError;
     exports.runSiteDiscoveryOnRunner = runSiteDiscoveryOnRunner2;
     exports.runFeatureDiscoveryOnRunner = runFeatureDiscoveryOnRunner2;
     var browser_config_js_1 = require_browser_config();
@@ -312028,7 +312570,7 @@ Respond with ONLY valid JSON:
   "keyFindings": "What was discovered - forms, validations, behaviors. Mark inferred items with '(inferred, not tested)'.",
   "testingNotes": "Gotchas, validation behaviors, error messages. List visible-but-untested routes as candidates for future exploration."
 }`;
-        const client = modelOverride ? (0, ai_provider_js_1.getClientForModel)(modelOverride) : (0, ai_provider_js_1.getAIClient)();
+        const client = modelOverride ? (0, ai_provider_js_1.getRunnerClientForModel)(modelOverride) : (0, ai_provider_js_1.getRunnerAIClient)();
         const agentModel = modelOverride ? (0, ai_provider_js_1.resolveModelForTask)(modelOverride, "agent") : (0, ai_provider_js_1.getModel)("agent");
         const callStart = Date.now();
         const response = await (0, ai_retry_js_1.withAIRetry)(() => (0, ai_queue_js_1.queuedAICall)(() => client.chat.completions.create({
@@ -312159,6 +312701,10 @@ Respond with ONLY valid JSON:
       });
       return timed.catch(() => null);
     }
+    function getFatalExploreError(exploreResult) {
+      const prefix = "Fatal error:";
+      return exploreResult.summary.startsWith(prefix) ? exploreResult.summary.slice(prefix.length).trim() || exploreResult.summary : void 0;
+    }
     async function runSiteDiscoveryOnRunner2(ctx, onLog, onAICall, sharedBrowser, onScreenshot, callbackOptions) {
       const logs2 = [];
       const screenshots = [];
@@ -312343,6 +312889,7 @@ Explore complete: ${exploreResult.pagesDiscovered} pages, ${exploreResult.elemen
           if (loginRunP)
             await loginRunP;
           const duration2 = (Date.now() - startTime) / 1e3;
+          const fatalExploreError = getFatalExploreError(exploreResult);
           return {
             collectedPages: exploreResult.collectedPages,
             collectedTransitions: exploreResult.collectedTransitions,
@@ -312353,6 +312900,7 @@ Explore complete: ${exploreResult.pagesDiscovered} pages, ${exploreResult.elemen
             pageScreenshots: onScreenshot ? void 0 : Object.fromEntries(mergedScreenshots),
             pageScreenshotKeys: onScreenshot ? Object.fromEntries(screenshotKeys) : void 0,
             summary: exploreResult.summary || "Exploration completed but no page data captured.",
+            error: fatalExploreError,
             exploreStats: {
               pagesDiscovered: exploreResult.pagesDiscovered,
               pagesVisited: exploreResult.pagesVisited,
@@ -312894,6 +313442,7 @@ Feature explore complete: ${exploreResult.pagesDiscovered} pages, ${exploreResul
           discoveryApiCalls = earlyClose.apiCalls;
           postCloseHealthSummary = earlyClose.healthSummary;
           const duration2 = (Date.now() - startTime) / 1e3;
+          const fatalExploreError = getFatalExploreError(exploreResult);
           return {
             collectedPages: exploreResult.collectedPages,
             collectedTransitions: exploreResult.collectedTransitions,
@@ -312904,7 +313453,8 @@ Feature explore complete: ${exploreResult.pagesDiscovered} pages, ${exploreResul
             healthObservations: earlyClose.healthSummary,
             pageScreenshots: onScreenshot ? void 0 : Object.fromEntries(mergedScreenshots),
             pageScreenshotKeys: onScreenshot ? Object.fromEntries(screenshotKeys) : void 0,
-            summary: "Feature exploration completed but no page data captured.",
+            summary: fatalExploreError ? exploreResult.summary : "Feature exploration completed but no page data captured.",
+            error: fatalExploreError,
             exploreStats: {
               pagesDiscovered: exploreResult.pagesDiscovered,
               pagesVisited: exploreResult.pagesVisited,
@@ -326293,7 +326843,7 @@ var require_package4 = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@validate.qa/runner",
-      version: "1.0.9",
+      version: "1.0.13",
       description: "validate local test runner - execute Playwright tests on your machine, connected to validate.qa cloud.",
       bin: {
         "validate-runner": "dist/cli.js"
@@ -326301,7 +326851,7 @@ var require_package4 = __commonJS({
       scripts: {
         build: "tsup",
         dev: "tsx src/cli.ts",
-        "test:mobile": "node --import tsx --test src/runner.mobile-ai-env.test.ts src/services/mobile/mobile-network-capture.smoke.test.ts",
+        "test:mobile": "node --import tsx --test src/runner.mobile-ai-env.test.ts src/services/mobile/mobile-network-capture.smoke.test.ts src/services/mobile/mobile-host-proxy.test.ts",
         prepublishOnly: "npm run build"
       },
       files: [
@@ -326528,8 +327078,10 @@ async function startAppiumServer(options) {
     return serverState;
   }
   const port = options?.port ?? APPIUM_PORT;
-  const drivers = options?.drivers ?? ["xcuitest", "uiautomator2"];
-  const args = ["--port", String(port), "--use-drivers", drivers.join(",")];
+  const args = ["--port", String(port)];
+  if (options?.drivers && options.drivers.length > 0) {
+    args.push("--use-drivers", options.drivers.join(","));
+  }
   intentionalStop = false;
   lastStartOptions = { ...lastStartOptions, ...options };
   if (appiumGaveUp) {
@@ -326539,11 +327091,12 @@ async function startAppiumServer(options) {
   killPort(port);
   return new Promise((resolve, reject) => {
     try {
-      appiumProcess = spawn("appium", args, {
+      const child = spawn("appium", args, {
         stdio: ["pipe", "pipe", "pipe"],
         env: { ...process.env },
         detached: false
       });
+      appiumProcess = child;
       serverState.pid = appiumProcess.pid ?? null;
       serverState.port = port;
       appiumProcess.stdout?.on("data", (data) => {
@@ -326560,7 +327113,11 @@ async function startAppiumServer(options) {
           options?.onLog?.(line);
         }
       });
-      appiumProcess.on("exit", (code, signal) => {
+      child.on("exit", (code, signal) => {
+        if (appiumProcess !== child) {
+          appendLog(`[appium] Ignoring exit (code=${code}, signal=${signal}) from a superseded process`);
+          return;
+        }
         appendLog(`[appium] Process exited (code=${code}, signal=${signal})`);
         const currentPort = serverState.port;
         const currentRestartCount = serverState.restartCount;
@@ -326599,7 +327156,11 @@ async function startAppiumServer(options) {
         startupAbort.abort();
         reject(err);
       };
-      appiumProcess.on("error", (err) => {
+      child.on("error", (err) => {
+        if (appiumProcess !== child) {
+          appendLog(`[appium] Ignoring error from a superseded process: ${err.message}`);
+          return;
+        }
         appendLog(`[appium] Process error: ${err.message}`);
         resetServerState(port);
         settleReject(new Error(`Failed to start Appium: ${err.message}. Is appium installed? Run: npm i -g appium`));
@@ -326718,6 +327279,7 @@ function runCommand(command, args, timeout = 1e4) {
 }
 var realIOSProfilerNegativeUntil = 0;
 var REAL_IOS_PROFILER_TTL_MS = 6e4;
+var REAL_IOS_NO_UDID_HINT = "no paired UDID \u2014 install libimobiledevice (brew install libimobiledevice) and trust this computer on the device";
 function discoverIOSSimulators() {
   if (platform() !== "darwin") return [];
   const json = runCommand("xcrun", ["simctl", "list", "devices", "--json"]);
@@ -326727,7 +327289,8 @@ function discoverIOSSimulators() {
     const devices = [];
     for (const [runtime, runtimeDevices] of Object.entries(parsed.devices)) {
       const versionMatch = runtime.match(/iOS[- ](\d+(?:[-.]\d+)*)/i);
-      const platformVersion = versionMatch ? versionMatch[1].replace(/-/g, ".") : "unknown";
+      if (!versionMatch) continue;
+      const platformVersion = versionMatch[1].replace(/-/g, ".");
       for (const device of runtimeDevices) {
         const state2 = device.state === "Booted" ? "BOOTED" : device.state === "Shutdown" ? "SHUTDOWN" : "LOADING";
         if (state2 === "BOOTED") {
@@ -326800,11 +327363,11 @@ function discoverRealIOSDevices() {
         const version = runCommand("ideviceinfo", ["-u", serial, "-k", "ProductVersion"]) || "unknown";
         devices.push({
           id: serial,
-          name,
+          name: `${name} (${REAL_IOS_NO_UDID_HINT})`,
           platform: "IOS",
           platformVersion: version,
           state: "BOOTED",
-          isAvailable: true,
+          isAvailable: false,
           isPhysical: true
         });
       }
@@ -326820,11 +327383,11 @@ function discoverRealIOSDevices() {
       if (hasIPhone || hasIPad) {
         devices.push({
           id: "usb-ios-device",
-          name: hasIPhone ? "iPhone (USB)" : "iPad (USB)",
+          name: `${hasIPhone ? "iPhone (USB)" : "iPad (USB)"} (${REAL_IOS_NO_UDID_HINT})`,
           platform: "IOS",
           platformVersion: "unknown",
           state: "BOOTED",
-          isAvailable: true,
+          isAvailable: false,
           isPhysical: true
         });
       }
@@ -326902,7 +327465,9 @@ function discoverAndroidDevices() {
   const adbDevices = parseAdbDevices();
   return adbDevices.filter((d) => d.type === "device" || d.type === "unauthorized").map((d) => {
     const isEmulator = d.serial.startsWith("emulator-");
-    const isAvailable = d.type === "device";
+    const authorized = d.type === "device";
+    const bootCompleted = authorized && getAndroidProp(d.serial, "sys.boot_completed") === "1";
+    const isAvailable = authorized && bootCompleted;
     const name = d.model || d.device || (isEmulator ? "Android Emulator" : "Android Device");
     const platformVersion = isAvailable ? getAndroidProp(d.serial, "ro.build.version.release") || "unknown" : "unknown";
     return {
@@ -326910,7 +327475,10 @@ function discoverAndroidDevices() {
       name,
       platform: "ANDROID",
       platformVersion,
-      state: "BOOTED",
+      // LOADING = authorized but still booting; an unauthorized device stays
+      // BOOTED (isAvailable false) so the dashboard shows it with an
+      // "accept USB debugging" hint rather than hiding it.
+      state: authorized && !bootCompleted ? "LOADING" : "BOOTED",
       isAvailable,
       // Mark if it's a real device vs emulator
       ...isEmulator ? {} : { isPhysical: true }
@@ -326956,15 +327524,25 @@ function discoverAllDevices(options) {
   }
   return [...iosDevices, ...androidDevices];
 }
+var DEVICE_SNAPSHOT_TTL_MS = 8e3;
+var cachedDeviceSnapshot = null;
+function getCachedDeviceSnapshot() {
+  const now = Date.now();
+  if (cachedDeviceSnapshot && now - cachedDeviceSnapshot.at < DEVICE_SNAPSHOT_TTL_MS) {
+    return cachedDeviceSnapshot.devices;
+  }
+  const devices = discoverAllDevices();
+  cachedDeviceSnapshot = { at: now, devices };
+  return devices;
+}
 function getRunnerCapabilities() {
-  const iosDevices = discoverIOSDevices();
-  const androidDevices = discoverAndroidDevices();
+  const devices = getCachedDeviceSnapshot();
   const isReadyDevice = (device) => device.isAvailable && device.state === "BOOTED";
   return {
     web: true,
     // Always capable of web testing via Playwright
-    ios: iosDevices.some(isReadyDevice),
-    android: androidDevices.some(isReadyDevice)
+    ios: devices.some((d) => d.platform === "IOS" && isReadyDevice(d)),
+    android: devices.some((d) => d.platform === "ANDROID" && isReadyDevice(d))
   };
 }
 
@@ -327103,6 +327681,9 @@ var MitmProxy = class {
     await server3.forAnyRequest().thenPassThrough({ ignoreHostHttpsErrors: true });
     await server3.on("request", (req) => this.onRequest(req));
     await server3.on("response", (res) => this.onResponse(res));
+    await server3.on("abort", (req) => {
+      this.inFlight.delete(req.id);
+    });
     await server3.on("tls-client-error", (failure) => this.onTlsClientError(failure));
     await server3.on("tls-passthrough-opened", (event) => this.onTlsPassthroughOpened(event));
     await (preferredPort > 0 ? server3.start(preferredPort) : server3.start());
@@ -327399,6 +327980,107 @@ async function iosSimRemoveCa(deviceId, onLog) {
 function errMsg(err) {
   return err instanceof Error ? err.message : String(err);
 }
+function parsePrimaryNetworkService(stdout) {
+  for (const line of stdout.split("\n")) {
+    const m = line.match(/^\(\d+\)\s+(.+)$/);
+    if (m) return m[1].trim();
+  }
+  return null;
+}
+function parseWebProxyState(stdout) {
+  const field = (label) => {
+    const m = stdout.match(new RegExp(`^${label}:[ \\t]*(.*)$`, "im"));
+    return m ? m[1].trim() : "";
+  };
+  return {
+    enabled: field("Enabled").toLowerCase() === "yes",
+    server: field("Server"),
+    port: field("Port")
+  };
+}
+function buildHostProxySetCommands(service, host, port) {
+  const portStr = String(port);
+  return [
+    ["-setwebproxy", service, host, portStr],
+    ["-setsecurewebproxy", service, host, portStr]
+  ];
+}
+function buildProxyRestoreArgs(setCmd, stateCmd, service, prior) {
+  if (prior.server) {
+    return [
+      [setCmd, service, prior.server, prior.port || "0"],
+      [stateCmd, service, prior.enabled ? "on" : "off"]
+    ];
+  }
+  return [[stateCmd, service, "off"]];
+}
+function buildHostProxyRestoreCommands(service, prior) {
+  return [
+    ...buildProxyRestoreArgs("-setwebproxy", "-setwebproxystate", service, prior.web),
+    ...buildProxyRestoreArgs("-setsecurewebproxy", "-setsecurewebproxystate", service, prior.secure)
+  ];
+}
+function hostProxyPriorFromMarker(marker) {
+  return {
+    web: {
+      enabled: Boolean(marker.hostWebProxyWasEnabled),
+      server: marker.hostWebProxyPriorServer ?? "",
+      port: marker.hostWebProxyPriorPort ?? ""
+    },
+    secure: {
+      enabled: Boolean(marker.hostSecureProxyWasEnabled),
+      server: marker.hostSecureProxyPriorServer ?? "",
+      port: marker.hostSecureProxyPriorPort ?? ""
+    }
+  };
+}
+function hostProxyControlSupported(platform3, isPhysical, platformName = process.platform) {
+  if (platform3 !== "IOS") return { supported: false };
+  if (isPhysical) {
+    return { supported: false, reason: "physical iOS device requires a manual Wi-Fi HTTP proxy; host proxy not applied" };
+  }
+  if (platformName !== "darwin") {
+    return { supported: false, reason: `iOS simulator host proxy is only controllable on macOS (host is ${platformName})` };
+  }
+  return { supported: true };
+}
+async function iosSimConfigureHostProxy(host, port, onLog) {
+  try {
+    const { stdout: order } = await execFileAsync("networksetup", ["-listnetworkserviceorder"], {
+      timeout: DEVICE_CMD_TIMEOUT_MS
+    });
+    const service = parsePrimaryNetworkService(order);
+    if (!service) {
+      return { configured: false, reason: "iOS simulator host proxy could not be configured: no active macOS network service found" };
+    }
+    const [{ stdout: webOut }, { stdout: secureOut }] = await Promise.all([
+      execFileAsync("networksetup", ["-getwebproxy", service], { timeout: DEVICE_CMD_TIMEOUT_MS }),
+      execFileAsync("networksetup", ["-getsecurewebproxy", service], { timeout: DEVICE_CMD_TIMEOUT_MS })
+    ]);
+    const prior = { web: parseWebProxyState(webOut), secure: parseWebProxyState(secureOut) };
+    for (const args of buildHostProxySetCommands(service, host, port)) {
+      await execFileAsync("networksetup", args, { timeout: DEVICE_CMD_TIMEOUT_MS });
+    }
+    onLog?.(`[mobile-net] macOS host proxy set on "${service}" \u2192 ${host}:${port} (iOS simulator shares the host network).`);
+    return { configured: true, service, prior };
+  } catch (err) {
+    return { configured: false, reason: `iOS simulator host proxy could not be configured: ${errMsg(err)}` };
+  }
+}
+async function iosSimRestoreHostProxy(service, prior, onLog) {
+  const restore = prior ?? {
+    web: { enabled: false, server: "", port: "" },
+    secure: { enabled: false, server: "", port: "" }
+  };
+  for (const args of buildHostProxyRestoreCommands(service, restore)) {
+    try {
+      await execFileAsync("networksetup", args, { timeout: DEVICE_CMD_TIMEOUT_MS });
+    } catch (err) {
+      onLog?.(`[mobile-net] networksetup restore (${args[0]}) failed: ${errMsg(err)}`);
+    }
+  }
+  onLog?.(`[mobile-net] macOS host proxy restored on "${service}".`);
+}
 var activeCleanups = /* @__PURE__ */ new Map();
 var exitHandlersInstalled = false;
 function markerPath(sessionKey) {
@@ -327433,6 +328115,14 @@ function restoreDeviceSync(marker, onLog) {
       run2(["-s", marker.deviceId, "shell", "rm", "-f", "/sdcard/validateqa-mobile-ca.pem"]);
     }
   }
+  if (marker.platform === "IOS" && marker.hostProxySet && marker.hostProxyService && process.platform === "darwin") {
+    for (const args of buildHostProxyRestoreCommands(marker.hostProxyService, hostProxyPriorFromMarker(marker))) {
+      try {
+        execFileSync3("networksetup", args, { timeout: DEVICE_CMD_TIMEOUT_MS, stdio: "ignore" });
+      } catch {
+      }
+    }
+  }
   onLog?.(`[mobile-net] restored device ${marker.deviceId} from pending-cleanup marker.`);
 }
 async function reconcilePendingCleanups(onLog) {
@@ -327444,6 +328134,8 @@ async function reconcilePendingCleanups(onLog) {
   }
   for (const file of files) {
     if (!file.endsWith(".json")) continue;
+    const sessionKey = file.slice(0, -".json".length);
+    if (activeCleanups.has(sessionKey)) continue;
     const full = join2(PENDING_CLEANUP_DIR, file);
     try {
       const raw = await readFile(full, "utf-8");
@@ -327473,8 +328165,10 @@ function ensureExitHandlers() {
   for (const signal of ["SIGTERM", "SIGINT"]) {
     process.on(signal, () => {
       drain();
-      process.removeAllListeners(signal);
-      process.kill(process.pid, signal);
+      if (process.listenerCount(signal) <= 1) {
+        process.removeAllListeners(signal);
+        process.kill(process.pid, signal);
+      }
     });
   }
 }
@@ -327524,6 +328218,9 @@ async function startMobileNetworkCapture(options) {
   let wiringReason = "HTTPS interception pending: capture begins once the device routes a TLS handshake through the proxy.";
   let proxySet = false;
   let caInstalledOnDevice = false;
+  let hostProxySet = false;
+  let hostProxyService;
+  let hostProxyPrior;
   try {
     if (platform3 === "ANDROID") {
       proxySet = await androidSetProxy(deviceId, hostPort, onLog);
@@ -327538,25 +328235,50 @@ async function startMobileNetworkCapture(options) {
       }
     } else {
       if (!isPhysical && caCertPath) {
-        const { trusted, note } = await iosSimTrustCa(deviceId, caCertPath);
+        const { trusted } = await iosSimTrustCa(deviceId, caCertPath);
         caInstalledOnDevice = trusted;
-        wiringReason = note;
+      }
+      const support = hostProxyControlSupported(platform3, isPhysical);
+      if (support.supported) {
+        const hp = await iosSimConfigureHostProxy(proxyHost, proxyPort, onLog);
+        if (hp.configured) {
+          hostProxySet = true;
+          hostProxyService = hp.service;
+          hostProxyPrior = hp.prior;
+          wiringReason = "iOS simulator traffic routed via the macOS host proxy; HTTPS interception pending until the app completes a TLS handshake through the proxy" + (caCertPath ? ` (trust ${caCertPath} in the simulator if the app rejects our CA).` : ".");
+        } else {
+          wiringReason = hp.reason ?? "iOS simulator host proxy could not be configured";
+          onLog?.(`[mobile-net] ${wiringReason}`);
+        }
       } else if (isPhysical) {
         wiringReason = "Physical iOS HTTPS is tunneled without MITM by default. Set the Wi-Fi HTTP proxy and trust the CA manually, then run with VALIDATEQA_MOBILE_FORCE_TLS_MITM=1 to decrypt HTTPS bodies" + (caCertPath ? ` (${caCertPath}).` : ".");
+      } else {
+        wiringReason = support.reason ?? "iOS simulator host proxy is unsupported on this host";
+        onLog?.(`[mobile-net] ${wiringReason}`);
       }
     }
   } catch (err) {
     wiringReason = `device wiring degraded: ${errMsg(err)}`;
     onLog?.(`[mobile-net] ${wiringReason}`);
   }
-  if (proxySet || caInstalledOnDevice) {
+  if (proxySet || caInstalledOnDevice || hostProxySet) {
     const marker = {
       platform: platform3,
       deviceId,
       isPhysical,
       proxySet,
       originalProxy,
-      caInstalledOnDevice
+      caInstalledOnDevice,
+      ...hostProxySet ? {
+        hostProxySet: true,
+        hostProxyService,
+        hostWebProxyWasEnabled: hostProxyPrior?.web.enabled,
+        hostWebProxyPriorServer: hostProxyPrior?.web.server,
+        hostWebProxyPriorPort: hostProxyPrior?.web.port,
+        hostSecureProxyWasEnabled: hostProxyPrior?.secure.enabled,
+        hostSecureProxyPriorServer: hostProxyPrior?.secure.server,
+        hostSecureProxyPriorPort: hostProxyPrior?.secure.port
+      } : {}
     };
     activeCleanups.set(sessionKey, marker);
     await writePendingCleanup(sessionKey, marker);
@@ -327576,6 +328298,9 @@ async function startMobileNetworkCapture(options) {
     if (proxySet && platform3 === "ANDROID") {
       await androidClearProxy(deviceId, originalProxy, onLog);
     }
+    if (hostProxySet && hostProxyService && platform3 === "IOS" && !isPhysical) {
+      await iosSimRestoreHostProxy(hostProxyService, hostProxyPrior, onLog);
+    }
     if (caInstalledOnDevice && capturedCaCertPath) {
       if (platform3 === "ANDROID") {
         await androidRemoveCa(deviceId, onLog);
@@ -327611,7 +328336,11 @@ async function startMobileNetworkCapture(options) {
 
 // src/services/appium-executor.ts
 var DEFAULT_STEP_TIMEOUT_MS = 1e4;
+var WD_SESSION_CREATE_TIMEOUT_MS = 12e4;
+var WD_ACTION_TIMEOUT_MS = 3e4;
+var MAX_SESSION_CREATE_ATTEMPTS = 3;
 var execFileAsync2 = promisify2(execFile2);
+var MOBILE_TEXT_ATTRIBUTE_NAMES = ["text", "content-desc", "contentDescription", "name", "label", "value"];
 var WebDriverTransportError = class extends Error {
   isTransport = true;
   constructor(message) {
@@ -327623,13 +328352,21 @@ function isTransportError(err) {
   return err instanceof WebDriverTransportError || typeof err === "object" && err !== null && err.isTransport === true;
 }
 async function wdRequest(path, options) {
+  const isSessionCreate = (options?.method ?? "GET").toUpperCase() === "POST" && path === "/session";
+  const timeoutMs = isSessionCreate ? WD_SESSION_CREATE_TIMEOUT_MS : WD_ACTION_TIMEOUT_MS;
   let res;
   try {
     res = await fetch(`http://localhost:${getAppiumState().port}${path}`, {
       ...options,
+      signal: AbortSignal.timeout(timeoutMs),
       headers: { "Content-Type": "application/json", ...options?.headers }
     });
   } catch (err) {
+    if (err instanceof Error && (err.name === "TimeoutError" || err.name === "AbortError")) {
+      throw new WebDriverTransportError(
+        `WebDriver request to ${path} timed out after ${timeoutMs}ms (device/Appium unresponsive)`
+      );
+    }
     throw new WebDriverTransportError(`WebDriver connection error: ${err instanceof Error ? err.message : String(err)}`);
   }
   if (!res.ok) {
@@ -327714,6 +328451,31 @@ async function createSession(target) {
   if (!sessionId) throw new Error("Appium session creation returned no session ID");
   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;
+var RETRYABLE_SESSION_START = /timed out|timeout|webdriveragent|xcodebuild|instruments|could not connect|lockdownd|failed to (start|launch|create)|unable to launch|session is either terminated|unavailable|econnrefused|connection error|xcuitest|\b50[234]\b/i;
+function isRetryableSessionStartError(err) {
+  const message = err instanceof Error ? err.message : String(err);
+  if (TERMINAL_SESSION_START.test(message)) return false;
+  if (isTransportError(err)) return true;
+  return RETRYABLE_SESSION_START.test(message);
+}
+async function createSessionWithRetry(target, onRetry) {
+  let lastErr;
+  for (let attempt = 1; attempt <= MAX_SESSION_CREATE_ATTEMPTS; attempt++) {
+    try {
+      return await createSession(target);
+    } catch (err) {
+      lastErr = err;
+      if (attempt >= MAX_SESSION_CREATE_ATTEMPTS || !isRetryableSessionStartError(err)) throw err;
+      const delayMs = Math.pow(2, attempt) * 1e3;
+      onRetry?.(
+        `Appium session start failed (attempt ${attempt}/${MAX_SESSION_CREATE_ATTEMPTS}, retrying in ${delayMs}ms): ${err instanceof Error ? err.message : String(err)}`
+      );
+      await new Promise((resolve) => setTimeout(resolve, delayMs));
+    }
+  }
+  throw lastErr instanceof Error ? lastErr : new Error(String(lastErr));
+}
 async function openDeepLink(sessionId, platform3, deeplink, appId) {
   const args = platform3 === "IOS" ? [{ url: deeplink, bundleId: appId }] : [{ url: deeplink, package: appId }];
   await wdRequest(`/session/${sessionId}/execute/sync`, {
@@ -327815,6 +328577,61 @@ async function takeScreenshot(sessionId) {
     return null;
   }
 }
+function mobileRecordingEnabled() {
+  const value = process.env.VALIDATEQA_MOBILE_RUN_VIDEO;
+  return value !== "0" && value !== "false";
+}
+function readPositiveIntEnv(name, fallback, min, max) {
+  const raw = process.env[name];
+  const parsed = raw ? Number.parseInt(raw, 10) : NaN;
+  if (!Number.isFinite(parsed)) return fallback;
+  return Math.max(min, Math.min(max, parsed));
+}
+async function startScreenRecording(sessionId, platform3, log2) {
+  if (!mobileRecordingEnabled()) {
+    log2("[mobile-video] recording disabled by VALIDATEQA_MOBILE_RUN_VIDEO=0");
+    return false;
+  }
+  const timeLimit = readPositiveIntEnv("VALIDATEQA_MOBILE_RECORDING_SECONDS", 180, 5, 180);
+  const options = {
+    timeLimit: String(timeLimit),
+    forceRestart: true
+  };
+  if (platform3 === "ANDROID") {
+    options.bitRate = readPositiveIntEnv("VALIDATEQA_MOBILE_RECORDING_BITRATE", 75e4, 1e5, 4e6);
+  } else {
+    options.videoQuality = process.env.VALIDATEQA_MOBILE_RECORDING_IOS_QUALITY || "low";
+  }
+  try {
+    await wdRequest(`/session/${sessionId}/appium/start_recording_screen`, {
+      method: "POST",
+      body: JSON.stringify({ options })
+    });
+    log2(`[mobile-video] screen recording started (${timeLimit}s max)`);
+    return true;
+  } catch (err) {
+    log2(`[mobile-video] screen recording unavailable: ${err instanceof Error ? err.message : String(err)}`);
+    return false;
+  }
+}
+async function stopScreenRecording(sessionId, log2) {
+  try {
+    const result = await wdRequest(`/session/${sessionId}/appium/stop_recording_screen`, {
+      method: "POST",
+      body: JSON.stringify({ options: {} })
+    });
+    const value = typeof result?.value === "string" ? result.value.trim() : "";
+    if (!value) {
+      log2("[mobile-video] screen recording stopped but Appium returned no video");
+      return void 0;
+    }
+    log2(`[mobile-video] screen recording captured (${Math.round(value.length / 1024)}KB base64)`);
+    return value;
+  } catch (err) {
+    log2(`[mobile-video] screen recording stop failed: ${err instanceof Error ? err.message : String(err)}`);
+    return void 0;
+  }
+}
 function boundsFromStep(step) {
   const bounds = step.metadata?.bounds;
   if (bounds && typeof bounds === "object" && !Array.isArray(bounds) && typeof bounds.x === "number" && typeof bounds.y === "number" && typeof bounds.width === "number" && typeof bounds.height === "number") {
@@ -327934,7 +328751,8 @@ async function sendKeysToFocusedInput(sessionId, value) {
   });
 }
 function encodeAndroidInputText(value) {
-  return value.replace(/%/g, "%25").replace(/\s/g, "%s");
+  const inputEncoded = value.replace(/%/g, "%25").replace(/\s/g, "%s");
+  return `'${inputEncoded.replace(/'/g, `'\\''`)}'`;
 }
 async function sendAndroidTextToFocusedInput(deviceId, value) {
   if (!deviceId) {
@@ -328158,9 +328976,29 @@ async function executeAssertText(sessionId, step) {
   const elementId = await findElement(sessionId, step.target, readStepTimeout(step));
   const result = await wdRequest(`/session/${sessionId}/element/${elementId}/text`);
   const actualText = typeof result?.value === "string" ? result.value : "";
-  if (!actualText.includes(step.assertion)) {
-    throw new Error(`Text assertion failed: expected "${step.assertion}" to be contained in "${actualText}"`);
+  const textCandidates = await readElementTextCandidates(sessionId, elementId, actualText);
+  if (!textCandidates.some((value) => value.includes(step.assertion))) {
+    throw new Error(`Text assertion failed: expected "${step.assertion}" to be contained in ${JSON.stringify(textCandidates)}`);
+  }
+}
+async function readElementTextCandidates(sessionId, elementId, actualText) {
+  const values = [];
+  const push = (value) => {
+    if (typeof value !== "string") return;
+    const trimmed = value.trim();
+    if (trimmed.length === 0 || values.includes(trimmed)) return;
+    values.push(trimmed);
+  };
+  push(actualText);
+  for (const attr of MOBILE_TEXT_ATTRIBUTE_NAMES) {
+    try {
+      const result = await wdRequest(`/session/${sessionId}/element/${elementId}/attribute/${encodeURIComponent(attr)}`);
+      push(result?.value);
+    } catch (err) {
+      if (isTransportError(err)) throw err;
+    }
   }
+  return values;
 }
 async function executeMobileTest(options) {
   const logLines = [];
@@ -328172,6 +329010,9 @@ async function executeMobileTest(options) {
   let sessionId = null;
   let capture = null;
   let captureStopped = false;
+  let recordingStarted = false;
+  let recordingStopped = false;
+  let video;
   const stopCapture = async () => {
     if (!capture || captureStopped) return apiCalls;
     captureStopped = true;
@@ -328186,6 +329027,15 @@ async function executeMobileTest(options) {
     }
     return apiCalls;
   };
+  const stopRecording = async () => {
+    if (!sessionId || !recordingStarted || recordingStopped) return video;
+    recordingStopped = true;
+    const captured = await stopScreenRecording(sessionId, log2);
+    if (captured) {
+      video = captured;
+    }
+    return video;
+  };
   try {
     log2("Checking Appium server health...");
     const health = await checkAppiumHealth();
@@ -328239,13 +329089,13 @@ async function executeMobileTest(options) {
     }
     log2(`Starting Appium session for ${options.target.appId} on ${selectedDevice.name}...`);
     try {
-      sessionId = await createSession({
+      sessionId = await createSessionWithRetry({
         appId: options.target.appId,
         platform: options.target.platform,
         deviceId: selectedDevice.id,
         platformVersion: options.target.platformVersion ?? selectedDevice.platformVersion,
         isPhysical: selectedDevice.isPhysical
-      });
+      }, (msg) => log2(msg));
     } catch (err) {
       const base2 = err instanceof Error ? err.message : String(err);
       if (selectedDevice.isPhysical) {
@@ -328260,6 +329110,7 @@ async function executeMobileTest(options) {
       throw err;
     }
     log2(`Session created: ${sessionId}`);
+    recordingStarted = await startScreenRecording(sessionId, options.target.platform, log2);
     if (options.target.launchMode === "DEEP_LINK" && options.target.deeplink) {
       try {
         log2(`Opening deep link: ${options.target.deeplink}`);
@@ -328320,7 +329171,9 @@ async function executeMobileTest(options) {
             break;
           }
         }
-        await restoreTargetAppIfExternal(sessionId, options.target, log2, `step ${step.order} (${step.action})`, true);
+        if (step.action !== "home" && step.action !== "back") {
+          await restoreTargetAppIfExternal(sessionId, options.target, log2, `step ${step.order} (${step.action})`, true);
+        }
       } catch (err) {
         status = "failed";
         stepError = err instanceof Error ? err.message : String(err);
@@ -328349,10 +329202,12 @@ async function executeMobileTest(options) {
     const allPassed = !environmental && stepResults.every((r) => r.status === "passed" || r.status === "skipped");
     const firstError = environmental ?? (stepResults.find((r) => r.status === "failed")?.error ?? null);
     await stopCapture();
+    await stopRecording();
     return {
       passed: allPassed,
       stepResults,
       screenshots,
+      ...video ? { video, videoMimeType: "video/mp4" } : {},
       apiCalls,
       logs: logLines.join("\n"),
       error: firstError,
@@ -328363,10 +329218,12 @@ async function executeMobileTest(options) {
     const errorMsg = err instanceof Error ? err.message : String(err);
     log2(`Fatal error: ${errorMsg}`);
     await stopCapture();
+    await stopRecording();
     return {
       passed: false,
       stepResults,
       screenshots,
+      ...video ? { video, videoMimeType: "video/mp4" } : {},
       apiCalls,
       logs: logLines.join("\n"),
       error: errorMsg,
@@ -328378,6 +329235,7 @@ async function executeMobileTest(options) {
     };
   } finally {
     await stopCapture();
+    await stopRecording();
     if (sessionId) {
       log2("Tearing down Appium session...");
       await deleteSession(sessionId);
@@ -328418,7 +329276,7 @@ async function createMobileDiscoverySession(target, options) {
     isPhysical: selectedDevice.isPhysical === true,
     platformVersion: selectedDevice.platformVersion
   });
-  const sessionId = await createSession({
+  const sessionId = await createSessionWithRetry({
     appId: target.appId,
     platform: target.platform,
     deviceId: selectedDevice.id,
@@ -329229,7 +330087,7 @@ function stopSessionReaper() {
   }
 }
 async function reapIdleSession() {
-  if (!state.appiumSessionId || state.mirrorClients.size > 0 || mirrorClientsEmptyAt === null || Date.now() - mirrorClientsEmptyAt < SESSION_IDLE_GRACE_MS) {
+  if (!state.appiumSessionId || mirrorSessionOwner !== "recording" || state.mirrorClients.size > 0 || mirrorClientsEmptyAt === null || Date.now() - mirrorClientsEmptyAt < SESSION_IDLE_GRACE_MS) {
     return;
   }
   const sessionId = state.appiumSessionId;
@@ -331746,6 +332604,11 @@ ${finalVerifyResult.logs ?? ""}`;
                 });
                 requestLiveBrowserHeartbeat();
               },
+              // D-D6 — upload ONE baseline PNG per newly-observed screen through the
+              // same streaming /page-screenshot relay the web path uses (mobile has no
+              // route, so the screen-id is the key). The returned storage key rides the
+              // explore checkpoint so the server links it to SitePage.screenshotKey.
+              onScreenshotUpload: (screenId, base64) => onScreenshot(screenId, base64),
               onExploreComplete,
               onTestGenerated,
               onPlanReady
@@ -332048,23 +332911,39 @@ ${finalVerifyResult.logs ?? ""}`;
         log.fail("ERROR - No mobile steps");
         return;
       }
+      const maxRetries = typeof run2.retryCount === "number" && Number.isFinite(run2.retryCount) ? Math.max(0, Math.min(2, Math.floor(run2.retryCount))) : 0;
       setExecutorBusy(true);
-      let result2;
+      let result2 = null;
+      const attemptLogs = [];
       try {
-        result2 = await executeMobileTest({
-          steps: mobileSteps,
-          target: {
-            appId: target.appId,
-            platform: target.platform,
-            platformVersion: target.platformVersion,
-            recordedDeviceId: target.recordedDeviceId,
-            launchMode: target.launchMode,
-            deeplink: target.deeplink
-          }
-        });
+        for (let attempt = 0; attempt <= maxRetries; attempt += 1) {
+          if (attempt > 0) {
+            log.info(`Retrying mobile test after failed Appium step (${attempt}/${maxRetries})`);
+          }
+          result2 = await executeMobileTest({
+            steps: mobileSteps,
+            target: {
+              appId: target.appId,
+              platform: target.platform,
+              platformVersion: target.platformVersion,
+              recordedDeviceId: target.recordedDeviceId,
+              launchMode: target.launchMode,
+              deeplink: target.deeplink
+            }
+          });
+          attemptLogs.push(`--- Appium attempt ${attempt + 1}/${maxRetries + 1} ---
+${result2.logs}`);
+          if (result2.passed || result2.environmental || attempt >= maxRetries) break;
+        }
       } finally {
         setExecutorBusy(false);
       }
+      if (!result2) {
+        throw new Error("Appium execution did not produce a result.");
+      }
+      if (attemptLogs.length > 1) {
+        result2 = { ...result2, logs: attemptLogs.join("\n\n") };
+      }
       const duration2 = Date.now() - startTime;
       const status = result2.environmental ? "ERROR" : result2.passed ? "PASSED" : "FAILED";
       const reportedError = result2.environmental ? `CONFIG_ISSUE: ${result2.environmental}` : result2.error ?? void 0;
@@ -332072,6 +332951,8 @@ ${finalVerifyResult.logs ?? ""}`;
         status,
         stepResults: result2.stepResults,
         screenshots: result2.screenshots,
+        video: result2.video,
+        videoMimeType: result2.videoMimeType,
         apiCalls: result2.apiCalls,
         logs: result2.logs,
         error: reportedError,
@@ -332383,7 +333264,7 @@ async function startRunner(opts) {
   };
   const sendHeartbeat = async () => {
     try {
-      const devices = enableMobile ? discoverAllDevices() : [];
+      const devices = enableMobile ? getCachedDeviceSnapshot() : [];
       const capabilities = enableMobile ? {
         web: true,
         ios: devices.some((d) => d.platform === "IOS" && d.isAvailable && d.state === "BOOTED"),