explorbot 0.1.13 → 0.1.16

package/dist/src/ai/provider.js

@@ -16,6 +16,16 @@ class AiError extends Error {
 }
 export class ContextLengthError extends Error {
 }
+function extractCachedTokens(usage) {
+    if (!usage)
+        return 0;
+    const direct = usage.cachedInputTokens ?? usage.inputTokenDetails?.cacheReadTokens;
+    if (typeof direct === 'number')
+        return direct;
+    const raw = usage.raw;
+    const fromRaw = raw?.prompt_tokens_details?.cached_tokens ?? raw?.promptTokensDetails?.cachedTokens;
+    return typeof fromRaw === 'number' ? fromRaw : 0;
+}
 function rejectAfterIdle(ms, signal) {
     return new Promise((_, reject) => {
         const tick = () => {
@@ -227,9 +237,10 @@ export class Provider {
             responseLog(response.text);
             if (response.usage) {
                 Stats.recordTokens(options.agentName || 'unknown', modelName, {
-                    input: response.usage.promptTokens || 0,
-                    output: response.usage.completionTokens || 0,
-                    total: response.usage.totalTokens || 0,
+                    input: response.usage.inputTokens ?? response.usage.promptTokens ?? 0,
+                    output: response.usage.outputTokens ?? response.usage.completionTokens ?? 0,
+                    total: response.usage.totalTokens ?? 0,
+                    cached: extractCachedTokens(response.usage),
                 });
             }
             return response;
@@ -311,9 +322,10 @@ export class Provider {
             responseLog(response.text);
             if (response.usage) {
                 Stats.recordTokens(options.agentName || 'unknown', modelName, {
-                    input: response.usage.promptTokens || 0,
-                    output: response.usage.completionTokens || 0,
-                    total: response.usage.totalTokens || 0,
+                    input: response.usage.inputTokens ?? response.usage.promptTokens ?? 0,
+                    output: response.usage.outputTokens ?? response.usage.completionTokens ?? 0,
+                    total: response.usage.totalTokens ?? 0,
+                    cached: extractCachedTokens(response.usage),
                 });
             }
             return response;
@@ -379,9 +391,10 @@ export class Provider {
             responseLog(response.object);
             if (response.usage) {
                 Stats.recordTokens(options.agentName || 'unknown', modelName, {
-                    input: response.usage.promptTokens || 0,
-                    output: response.usage.completionTokens || 0,
-                    total: response.usage.totalTokens || 0,
+                    input: response.usage.inputTokens ?? response.usage.promptTokens ?? 0,
+                    output: response.usage.outputTokens ?? response.usage.completionTokens ?? 0,
+                    total: response.usage.totalTokens ?? 0,
+                    cached: extractCachedTokens(response.usage),
                 });
             }
             return response;
@@ -555,9 +568,9 @@ export class Provider {
             responseLog(response.text);
             if (response.usage) {
                 Stats.recordTokens('vision', this.getModelName(this.config.visionModel), {
-                    input: response.usage.promptTokens || 0,
-                    output: response.usage.completionTokens || 0,
-                    total: response.usage.totalTokens || 0,
+                    input: response.usage.inputTokens ?? response.usage.promptTokens ?? 0,
+                    output: response.usage.outputTokens ?? response.usage.completionTokens ?? 0,
+                    total: response.usage.totalTokens ?? 0,
                 });
             }
             return response;

package/dist/src/ai/quartermaster.js

@@ -169,10 +169,10 @@ Focus on what would confuse a real user or caused the agent to make mistakes.`;
         const criticalViolations = report.axeViolations.filter((v) => v.impact === 'critical' || v.impact === 'serious');
         for (const v of criticalViolations.slice(0, 3)) {
             const nodeHtml = v.nodes[0]?.html.slice(0, 100) || '';
-            task.addNote(`🔴 A11Y [${v.impact}] ${v.id}: ${v.description} — ${nodeHtml}`);
+            task.addVerificationDetail(`🔴 A11Y [${v.impact}] ${v.id}: ${v.description} — ${nodeHtml}`);
         }
         for (const issue of report.semanticIssues.slice(0, 3)) {
-            task.addNote(`💡 UX [${issue.type}] ${issue.element}: ${issue.suggestion}`);
+            task.addVerificationDetail(`💡 UX [${issue.type}] ${issue.element}: ${issue.suggestion}`);
         }
     }
     saveReport(stateHash, report) {

package/dist/src/ai/researcher/focus.js

@@ -1,20 +1,61 @@
-import { detectFocusArea } from "../../utils/aria.js";
 import { mdq } from "../../utils/markdown-query.js";
 export const FOCUSED_MARKER = '> **Focused**';
 const FOCUS_SKIP_SECTIONS = new Set(['navigation', 'menu']);
 export function hasFocusedSection(text) {
     return text.includes(FOCUSED_MARKER);
 }
-export function detectFocusFromAria(ariaSnapshot, sections) {
-    const focusArea = detectFocusArea(ariaSnapshot);
-    if (!focusArea.detected)
-        return null;
-    if (focusArea.type === 'dialog' || focusArea.type === 'modal') {
-        const dialogSection = sections.find((s) => s.containerCss && (s.containerCss.includes('[role="dialog"]') || s.containerCss.includes('[role="alertdialog"]') || s.containerCss.includes('[aria-modal')));
-        if (dialogSection)
-            return dialogSection.name;
+export async function detectFocusedSection(page, sections) {
+    const candidates = [];
+    for (const section of sections) {
+        if (!section.containerCss)
+            continue;
+        const key = section.name.toLowerCase().replace(/^section:\s*/, '');
+        if (FOCUS_SKIP_SECTIONS.has(key))
+            continue;
+        try {
+            const locator = page.locator(section.containerCss).first();
+            if (!(await locator.isVisible()))
+                continue;
+            const probe = await locator.evaluate((el) => {
+                const dialogSelector = '[role="dialog"], [role="alertdialog"], [aria-modal="true"]';
+                const isDialog = el.matches(dialogSelector) || !!el.querySelector(dialogSelector);
+                let cur = el;
+                let maxZ = 0;
+                while (cur && cur !== document.body) {
+                    const cs = window.getComputedStyle(cur);
+                    if (cs.position !== 'static') {
+                        const z = Number.parseInt(cs.zIndex, 10);
+                        if (!Number.isNaN(z) && z > maxZ)
+                            maxZ = z;
+                    }
+                    cur = cur.parentElement;
+                }
+                const shadow = window.getComputedStyle(el).boxShadow;
+                const hasShadow = !!shadow && shadow !== 'none';
+                return { isDialog, zIndex: maxZ, hasShadow };
+            });
+            candidates.push({ name: section.name, ...probe });
+        }
+        catch { }
     }
-    return null;
+    if (candidates.length === 0)
+        return null;
+    const dialogs = candidates.filter((c) => c.isDialog);
+    const pool = dialogs.length > 0 ? dialogs : candidates;
+    const winner = pool.reduce((best, c) => {
+        if (!best)
+            return c;
+        if (c.zIndex !== best.zIndex)
+            return c.zIndex > best.zIndex ? c : best;
+        if (c.hasShadow !== best.hasShadow)
+            return c.hasShadow ? c : best;
+        return best;
+    }, null);
+    if (!winner)
+        return null;
+    if (dialogs.length === 0 && winner.zIndex === 0 && !winner.hasShadow)
+        return null;
+    return winner.name;
 }
 export function markSectionAsFocused(result, sectionName) {
     if (hasFocusedSection(result.text))

package/dist/src/ai/researcher/sections.js

@@ -3,6 +3,8 @@ import { executionController } from "../../execution-controller.js";
 import { tag } from '../../utils/logger.js';
 import { RulesLoader } from "../../utils/rules-loader.js";
 import { locatorRule as generalLocatorRuleText } from '../rules.js';
+import { markSectionAsFocused } from "./focus.js";
+import { ResearchResult } from "./research-result.js";
 export function WithSections(Base) {
     return class extends Base {
         async researchBySections() {
@@ -40,10 +42,12 @@ export function WithSections(Base) {
             if (parts.length === 0) {
                 throw new Error('Per-section research produced no sections — AI responses all empty or NOT_PRESENT');
             }
-            let merged = parts.join('\n\n');
-            if (focusCss)
-                merged += '\n\n> Focused: Focus';
-            return merged;
+            const merged = parts.join('\n\n');
+            if (!focusCss)
+                return merged;
+            const focused = new ResearchResult(merged, this.actionResult?.url || '');
+            markSectionAsFocused(focused, 'Focus');
+            return focused.text;
         }
         async _detectFocusCss() {
             const focusSections = this.explorer.getConfig().ai?.agents?.researcher?.focusSections;

package/dist/src/ai/researcher.js

@@ -16,7 +16,7 @@ import { ContextLengthError } from './provider.js';
 import { findSimilarResearch, getCachedResearch, saveResearch } from "./researcher/cache.js";
 import { WithCoordinates } from "./researcher/coordinates.js";
 import { WithDeepAnalysis } from "./researcher/deep-analysis.js";
-import { detectFocusFromAria, hasFocusedSection, markSectionAsFocused, pickDefaultFocusedSection } from "./researcher/focus.js";
+import { detectFocusedSection, hasFocusedSection, markSectionAsFocused, pickDefaultFocusedSection } from "./researcher/focus.js";
 import { WithLocators } from "./researcher/locators.js";
 import { extractValidContainers, formatResearchSummary, parseResearchSections } from "./researcher/parser.js";
 import { ResearchResult } from "./researcher/research-result.js";
@@ -186,18 +186,13 @@ export class Researcher extends ResearcherBase {
             if (!interrupted() && fix && result.locators.some((l) => l.valid === false)) {
                 await this.fixBrokenSections(result, activeConversation);
             }
-            // Focused section: parse AI declaration, then ARIA fallback
-            const focusMatch = result.text.match(/^>\s*Focused:\s*(.+)/m);
-            if (focusMatch) {
-                result.text = result.text.replace(focusMatch[0], '');
-                markSectionAsFocused(result, focusMatch[1].trim());
-            }
-            if (!hasFocusedSection(result.text)) {
+            // Focused section: unified Playwright probe (HTML+CSS+visibility).
+            // Must run BEFORE visuallyAnnotateContainers — annotation overlays inject z-index 99998+ which would pollute the scoring.
+            if (!interrupted() && this.hasScreenshotToAnalyze) {
                 const sections = parseResearchSections(result.text);
-                const ariaSnapshot = this.actionResult?.getCompactARIA() || '';
-                const focusedName = detectFocusFromAria(ariaSnapshot, sections);
-                if (focusedName)
-                    markSectionAsFocused(result, focusedName);
+                const focused = await detectFocusedSection(this.explorer.playwrightHelper.page, sections);
+                if (focused)
+                    markSectionAsFocused(result, focused);
             }
             // Stage 4: Visual analysis
             if (!interrupted() && this.hasScreenshotToAnalyze) {
@@ -232,8 +227,8 @@ export class Researcher extends ResearcherBase {
                 await this.backfillCoordinates(result);
                 await this.backfillBrokenLocators(result);
             }
-            // Focused section: final fallback
-            if (!hasFocusedSection(result.text)) {
+            // Focused section: final fallback (vision-only — without a screenshot we don't infer focus)
+            if (this.hasScreenshotToAnalyze && !hasFocusedSection(result.text)) {
                 const sections = parseResearchSections(result.text);
                 const fallback = pickDefaultFocusedSection(sections);
                 if (fallback)
@@ -388,16 +383,6 @@ export class Researcher extends ResearcherBase {
 
       | Element | ARIA | CSS | eidx |
       </section_format>
-
-      <focused_section>
-      At the end of your output, declare the primary focus area on a single line:
-
-      > Focused: <exact section name>
-
-      - If a dialog/modal/drawer/overlay exists, it is focused.
-      - Otherwise pick the section where the main business action happens (list for catalog, detail for item page, content for article).
-      - Navigation and menu/toolbar are never focused.
-      </focused_section>
     `;
     }
     async buildResearchPrompt() {

package/dist/src/ai/rules.js

@@ -231,6 +231,8 @@ export function multipleTabsRule(tabs) {
 }
 export const actionRule = dedent `
   <actions>
+  \`faker\` (from @faker-js/faker) is available inside I.* calls for generating data, e.g. I.fillField('Bio', faker.lorem.paragraphs(5)).
+
   ### I.click
 
   clicks on the element by its locator

package/dist/src/ai/session-analyst.js

@@ -13,68 +13,70 @@ export class SessionAnalyst {
         const eligible = tests.filter((t) => t.startTime != null);
         if (eligible.length === 0)
             return '';
-        const model = this.provider.getModelForAgent('analyst');
+        const model = this.provider.getAgenticModel('analyst');
         const customPrompt = this.provider.getSystemPromptForAgent('analyst', undefined);
         const systemPrompt = dedent `
-      You write a brief end-of-session report after autonomous exploratory testing. Your reader is a developer who needs to know in seconds: what is broken, how to reproduce it, and which results were inconclusive.
+      You write a TERSE end-of-session report. Reader is a developer who wants to UNDERSTAND THE FEATURE — what works, what is broken, what is unclear. Every word must earn its place.
 
-      Output MARKDOWN. No JSON, no preamble, no closing remarks. Start with the heading.
+      Output MARKDOWN. No JSON, no preamble, no closing summary.
 
-      ## Clustering
-      Group by ROOT CAUSE, not by scenario. If three tests fail for the same dropdown, that is ONE defect listing all three test refs (#3, #5, #7). Do not produce one cluster per test.
+      NO EMOJI. No 🔴 🟡 🟢 ✅, no escape sequences like \\u2705. Use plain text severity tags: [High], [Medium], [Low] for defects.
 
-      ## Bucketing
-      Use the FINAL verdict (the test's \`result\` field) as the starting point. Mid-test errors that the automation recovered from do NOT make a passed test unreliable.
+      ## Reporting unit
 
-      - **Defect** — real product bug. \`result: failed\` AND the failure reflects the app misbehaving (not the automation). The automation completed its interactions, the app contradicted the expected outcome. Severity required.
-      - **UX issue** — app works but the UI is ambiguous, controls are hidden, or labels are unclear. Worth flagging to design.
-      - **Execution issue** — the FINAL verdict is unreliable. Only two cases:
-        1. \`result: failed\` AND the failure was automation, environment, or UI/UX (locator missing, timeout, AI loop, navigation stuck, modal trapped focus, no accessible label) — i.e. the test could not conclude whether the app works.
-        2. \`result: passed\` AND clear evidence in the log shows the user-visible goal was NOT achieved (no confirmation visible, no state change verified, the assertion was vacuous).
+      Report at the level of FEATURES / FLOWS / PAGES. Tests are evidence, not the unit. Several tests covering the same flow → ONE entry citing all of them.
 
-      A test that passed and shows no contrary evidence belongs in NO section. Do not list passed tests just because the log contains intermediate retries or recovered failures.
+      ## Walk every test
 
-      ## Severity emoji (defects only)
-      - 🔴 critical or high — core flow blocked, data loss, security
-      - 🟡 medium — partial breakage with workaround
-      - 🟢 low — cosmetic
+      PASSED test: did all steps run, was the goal actually verified, did the user-visible goal happen? All yes → contributes to What works. Any no → Execution issue (false positive).
 
-      ## Required format
+      FAILED test, first match wins: (1) goal achieved but mis-verified → Execution. (2) automation failure (locator/timeout/loop/modal/a11y) → Execution. (3) bad preconditions or data → Execution. (4) wrong URL/environment → Execution. (5) app contradicted expected outcome → Defect.
+
+      Crucial distinction: "the app misbehaved" vs "the automation could not interact with the app". ONLY the first is a Defect. If the automation gives up before the app responds — timeout, retries exhausted, dead loop / loop detected, could not click or find an element — that is an Execution issue regardless of what the log calls it. Failure inside the automation ≠ failure inside the product.
+
+      A solitary failure where adjacent tests on the same feature passed → Execution, not Defect.
+
+      ## Severity (defects only)
+      [High] blocks a core flow · [Medium] degrades a flow but workaround exists · [Low] cosmetic / edge case
+
+      ## Format
 
       # Session Analysis
 
-      <one sentence: total tests, defect count, headline finding>
+      <ONE or TWO sentences describing the FEATURE STATE — what was explored, whether the core flow holds, what the standout problem is. NO test counts, NO "N tests run". Talk about the product, not the run.>
+
+      ## Coverage
+      - Pages: <paths>
+      - Features: <capabilities>
+
+      ## What works
+      - **<feature>** — #2, #7, #8
 
       ## Defects
 
-      ### 🔴 <plain-English title of the BUG, not the scenario name>
-      Affects: #3, #5, #7
+      ### [Medium] <plain-English bug title>
+      Affects: #3, #5
       Reproduce:
-        1. <concrete UI step a person can replay>
-        2. <next step>
-      Evidence: <one short observation from the test log>
-
-      ### 🟡 <next defect>
-      ...
+        1. <concrete UI step>
+        2. <next>
+      Evidence: <one short observation>
 
       ## UX issues
-
-      - **<title>** — #4
-        <one short evidence line>
+      - **<feature>** — <what's confusing> (#7)
 
       ## Execution Issues
+      - **#2 <scenario>** — <≤10 words, what was unreliable>
 
-      - **<short test name or scenario phrase>** — <plain-English one-liner: what made the result unreliable>
-      - **<…>** — <…>
+      ## Brevity rules
 
-      ## Rules
-      - Defects first, sorted by severity descending. Omit any section that has zero entries.
-      - Defect title describes the BUG ("Run-type dropdown does not filter"), never the scenario name.
-      - Reproduce steps are concrete UI actions derived from the log: URL + clicks + inputs. Imperative, one short line each.
-      - Evidence is the smallest factual observation from notes/steps that supports the claim — what was OBSERVED in the page (HTML, message, missing element). Never quote the test's \`result\` field as evidence; that is a tautology.
-      - **Execution Issues** entries must explain what actually went wrong in concrete terms a human understands: "could not find a Submit button after navigation", "page reloaded before the assertion ran", "passed without ever seeing a confirmation message", "marked failed but the new item appears in the list", "modal trapped focus and tests could not click outside", "ARIA tree had no labelled controls". Avoid jargon like "locator failed" without context. Never write category prefixes ("execution:", "false-positive:") — the section header already says it. No emoji on these entries.
-      - Do NOT include a passed test in any section unless evidence proves its goal was not achieved. Intermediate retries or recovered errors in the log are not grounds for listing a passed test.
-      - No editorialising, no restating the scenario verbatim, no closing summary.
+      - Headline: 2 sentences MAX. About the FEATURE, not the run. No counts, no "N tests", no "this session". Banned words: "exercised", "comprehensive", "notably", "this session", "module", "targeted", "covered creation".
+      - What works: feature name + test refs. NO parentheticals, NO caveats. If there's a caveat, the entry doesn't belong here.
+      - Defect title is the BUG ("Search returns non-matching results"), never the scenario name.
+      - Reproduce steps are imperative one-liners drawn from the log.
+      - Evidence is one short factual observation. Never quote the \`result\` field.
+      - Execution Issues: ONE line per test, ≤10 words, plain. Examples: "passed vacuously, no list assertion", "no file upload step in log", "dead loop on Save click". No prefixes, no nested explanation.
+      - Omit any empty section.
+      - Section order: Coverage → What works → Defects (severity desc) → UX issues → Execution Issues.
 
       ${customPrompt || ''}
     `;
@@ -87,7 +89,7 @@ export class SessionAnalyst {
             { role: 'system', content: systemPrompt },
             { role: 'user', content: userPayload },
         ], model, { agentName: 'analyst' });
-        return (response?.text || '').trim();
+        return decodeEscapes((response?.text || '').trim());
     }
     writeReport(markdown) {
         const filePath = outputPath('reports', `${Stats.sessionLabel()}.md`);
@@ -115,3 +117,6 @@ export class SessionAnalyst {
     `;
     }
 }
+function decodeEscapes(text) {
+    return text.replace(/\\u\{([0-9a-fA-F]+)\}/g, (_, hex) => String.fromCodePoint(Number.parseInt(hex, 16))).replace(/\\u([0-9a-fA-F]{4})/g, (_, hex) => String.fromCodePoint(Number.parseInt(hex, 16)));
+}

package/dist/src/ai/tester.js

@@ -49,6 +49,8 @@ export class Tester extends TaskAgent {
     pageStateHash = null;
     pageActionResult = null;
     hooksRunner;
+    seenUiMapUrls = new Set();
+    lastAnalyzedStateHash = null;
     constructor(explorer, provider, researcher, navigator, agentTools) {
         super();
         this.explorer = explorer;
@@ -80,7 +82,7 @@ export class Tester extends TaskAgent {
         return ActionResult.fromState(this.explorer.getStateManager().getCurrentState());
     }
     get progressCheckInterval() {
-        return this.explorer.getConfig().ai?.agents?.tester?.progressCheckInterval ?? 5;
+        return this.explorer.getConfig().ai?.agents?.tester?.progressCheckInterval ?? 3;
     }
     getConversation() {
         return this.currentConversation;
@@ -96,6 +98,8 @@ export class Tester extends TaskAgent {
         this.previousStateHash = null;
         this.pageStateHash = null;
         this.pageActionResult = null;
+        this.seenUiMapUrls.clear();
+        this.lastAnalyzedStateHash = null;
         this.explorer.getStateManager().clearHistory();
         this.resetFailureCount();
         this.pilot?.reset();
@@ -117,12 +121,18 @@ export class Tester extends TaskAgent {
         page?.on('console', onConsoleMessage);
         const initialState = ActionResult.fromState(state);
         const conversation = this.provider.startConversation(this.getSystemMessage(), 'tester');
+        conversation.markLastMessageCacheable();
         this.currentConversation = conversation;
         const outputDir = ConfigParser.getInstance().getOutputDir();
         this.executionLogFile = join(outputDir, `tester_${task.sessionName}.md`);
         // Note: Markdown saving functionality removed from Conversation class
-        const initialPrompt = await this.buildTestPrompt(task, initialState);
-        conversation.addUserText(initialPrompt);
+        const scenarioBlock = this.buildScenarioBlock(task, initialState);
+        conversation.addUserText(scenarioBlock);
+        conversation.markLastMessageCacheable();
+        conversation.protectPrefix(conversation.messages.length);
+        const pageContext = await this.reinjectContextIfNeeded(1, initialState);
+        if (pageContext)
+            conversation.addUserText(pageContext);
         return await Observability.run(`test: ${task.scenario}`, {
             sessionId: task.sessionName,
             tags: ['tester'],
@@ -138,6 +148,12 @@ export class Tester extends TaskAgent {
         if (this.pilot) {
             try {
                 const plan = await this.pilot.planTest(task, initialState);
+                if (task.hasFinished) {
+                    offFailedRequest?.();
+                    page?.off('pageerror', onPageError);
+                    page?.off('console', onConsoleMessage);
+                    return { success: task.isSuccessful };
+                }
                 if (plan) {
                     conversation.addUserText(`Pilot's test plan:\n${plan}\n\nFollow this plan while executing the test.`);
                 }
@@ -158,14 +174,18 @@ export class Tester extends TaskAgent {
         await this.explorer.startTest(task);
         debugLog(`Navigating to ${task.startUrl}`);
         await this.explorer.visit(task.startUrl);
-        const currentUrl = this.explorer.getStateManager().getCurrentState()?.url || task.startUrl || '';
+        const startState = this.explorer.getStateManager().getCurrentState();
+        if (startState)
+            task.addUrlNote(startState);
+        const currentUrl = startState?.url || task.startUrl || '';
         await this.hooksRunner.runBeforeHook('tester', currentUrl);
         const offStateChange = this.explorer.getStateManager().onStateChange((event) => {
             if (task.hasFinished)
                 return;
             if (event.toState?.url === event.fromState?.url)
                 return;
-            task.addNote(`Navigated to ${event.toState?.url}`, TestResult.PASSED);
+            if (event.toState)
+                task.addUrlNote(event.toState, event.fromState || undefined);
             task.states.push(event.toState);
         });
         const codeceptjsTools = createCodeceptJSTools(this.explorer, task);
@@ -203,13 +223,13 @@ export class Tester extends TaskAgent {
             The user has interrupted and wants to change direction. Follow the new instruction.
           `);
                 }
-                conversation.cleanupTag('page_aria', '...cleaned aria snapshot...', 2);
+                conversation.cleanupTag('page_aria', '...cleaned aria snapshot...', 1);
                 conversation.cleanupTag('page_html', '...cleaned HTML snapshot...', 1);
                 conversation.cleanupTag('experience', '...cleaned experience...', 1);
                 conversation.cleanupTag('applied_experience', '...cleaned past experience...', 1);
                 conversation.cleanupTag('page_ui_map', '...cleaned UI map...', 1);
                 conversation.cleanupTag('page_ui_map_overlay', '...cleaned UI overlay...', 1);
-                conversation.compactToolResults(3);
+                conversation.compactToolResults(2);
                 if (iteration > 1) {
                     const isNewPage = this.previousUrl !== null && this.previousUrl !== currentState.url;
                     let nextStep = '';
@@ -220,16 +240,17 @@ export class Tester extends TaskAgent {
                         if (guidance)
                             nextStep += `\n\n${guidance}`;
                     }
-                    else if ((iteration % this.progressCheckInterval === 0 || this.consecutiveFailures >= 3 || this.consecutiveEmptyResults >= 2) && this.pilot) {
+                    else if (this.shouldAnalyzeProgress(iteration, currentState) && this.pilot) {
                         const guidance = await this.pilot.analyzeProgress(task, currentState, conversation);
                         if (guidance)
                             nextStep += `\n\n${guidance}`;
                         this.consecutiveFailures = 0;
+                        this.lastAnalyzedStateHash = currentState.hash;
                     }
                     conversation.addUserText(nextStep);
                 }
                 const result = await this.provider.invokeConversation(conversation, tools, {
-                    maxToolRoundtrips: 5,
+                    maxToolRoundtrips: 3,
                     toolChoice: 'required',
                     stopWhen: () => task.hasFinished,
                 });
@@ -308,10 +329,15 @@ export class Tester extends TaskAgent {
                     : undefined,
                 catch: async ({ error, stop }) => {
                     tag('error').log(`Test execution error: ${error}`);
+                    const message = error instanceof Error ? error.message : String(error);
                     if (!task.hasFinished) {
-                        task.addNote(`Execution error: ${error instanceof Error ? error.message : String(error)}`);
+                        task.addNote(`Execution error: ${message}`);
                     }
-                    stop();
+                    if (error instanceof Error && error.name === 'AbortError') {
+                        stop();
+                        return;
+                    }
+                    conversation.addUserText(`Previous AI call failed: ${message}. Take a different approach on the next step.`);
                 },
             });
             if (task.hasFinished)
@@ -354,6 +380,17 @@ export class Tester extends TaskAgent {
             ...task,
         };
     }
+    shouldAnalyzeProgress(iteration, currentState) {
+        if (this.consecutiveFailures >= 3)
+            return true;
+        if (this.consecutiveEmptyResults >= 2)
+            return true;
+        if (iteration % this.progressCheckInterval !== 0)
+            return false;
+        if (this.lastAnalyzedStateHash === currentState.hash)
+            return false;
+        return true;
+    }
     async prepareInstructionsForNextStep(task) {
         let outcomeStatus = dedent `
       <task>
@@ -432,19 +469,23 @@ export class Tester extends TaskAgent {
             this.explorer.clearOtherTabsInfo();
         }
         if (isNewUrl) {
+            const alreadySeenUiMap = this.seenUiMapUrls.has(currentUrl);
             let research = '';
-            try {
-                research = await this.researcher.research(currentState);
-            }
-            catch (err) {
-                if (!(err instanceof ErrorPageError))
-                    throw err;
-                tag('warning').log(`Research skipped: ${err.message}`);
+            if (!alreadySeenUiMap) {
+                try {
+                    research = await this.researcher.research(currentState);
+                }
+                catch (err) {
+                    if (!(err instanceof ErrorPageError))
+                        throw err;
+                    tag('warning').log(`Research skipped: ${err.message}`);
+                }
             }
             this.pageStateHash = currentStateHash;
             this.pageActionResult = currentState;
             let uiMapSection = '';
             if (research) {
+                this.seenUiMapUrls.add(currentUrl);
                 uiMapSection = dedent `
 
           Page UI Map
@@ -454,6 +495,9 @@ export class Tester extends TaskAgent {
           </page_ui_map>
         `;
             }
+            else if (alreadySeenUiMap) {
+                uiMapSection = `\n\n<page_ui_map>UI map for ${currentUrl} was shown earlier in this session — refer to it above.</page_ui_map>`;
+            }
             context += dedent `
         Context:
 
@@ -651,9 +695,8 @@ export class Tester extends TaskAgent {
     ${this.provider.getSystemPromptForAgent('tester', this.explorer.getStateManager().getCurrentState()?.url) || ''}
     `;
     }
-    async buildTestPrompt(task, actionResult) {
+    buildScenarioBlock(task, actionResult) {
         const knowledge = this.getKnowledge(actionResult);
-        const pageContext = await this.reinjectContextIfNeeded(1, actionResult);
         return dedent `
       <task>
       SCENARIO GOAL: ${task.scenario}
@@ -680,8 +723,6 @@ export class Tester extends TaskAgent {
       ${this.buildAvailableFiles()}
 
       ${knowledge}
-
-      ${pageContext}
     `;
     }
     getDeletableSessionNames(task) {