explorbot 0.2.0 → 0.2.2

package/src/ai/pilot.ts

@@ -2,8 +2,11 @@ import { tool } from 'ai';
 import dedent from 'dedent';
 import { z } from 'zod';
 import { ActionResult } from '../action-result.ts';
+import type { RequestStore } from '../api/request-store.ts';
 import { ConfigParser } from '../config.ts';
 import type Explorer from '../explorer.ts';
+import type { PlaywrightRecorder } from '../playwright-recorder.ts';
+import type { StateManager } from '../state-manager.ts';
 import { type Test, TestResult } from '../test-plan.ts';
 import { collectInteractiveNodes, detectFocusArea, extractFocusedElement } from '../utils/aria.ts';
 import { ErrorPageError } from '../utils/error-page.ts';
@@ -11,7 +14,7 @@ import { createDebug, tag } from '../utils/logger.ts';
 
 const debugLog = createDebug('explorbot:pilot');
 import { truncateJson } from '../utils/strings.ts';
-import type { Agent } from './agent.ts';
+import type { Agent, AgentDeps } from './agent.ts';
 import type { Conversation } from './conversation.ts';
 import type { Fisherman } from './fisherman.ts';
 import type { Navigator } from './navigator.ts';
@@ -30,13 +33,19 @@ export class Pilot implements Agent {
   private conversation: Conversation | null = null;
   private researcher: Researcher;
   private explorer: Explorer;
+  private stateManager: StateManager;
+  private requestStore: RequestStore;
+  private playwrightRecorder: PlaywrightRecorder;
   private fisherman: Fisherman | null = null;
 
-  constructor(provider: Provider, agentTools: any, researcher: Researcher, explorer: Explorer) {
-    this.provider = provider;
+  constructor(deps: AgentDeps, agentTools: any, researcher: Researcher) {
+    this.provider = deps.ai;
     this.agentTools = agentTools;
     this.researcher = researcher;
-    this.explorer = explorer;
+    this.explorer = deps.explorer;
+    this.stateManager = deps.stateManager;
+    this.requestStore = deps.requestStore;
+    this.playwrightRecorder = deps.playwrightRecorder;
   }
 
   setFisherman(fisherman: Fisherman): void {
@@ -91,7 +100,7 @@ export class Pilot implements Agent {
     let screenshotState: ActionResult | null = null;
     if (type === 'finish' && this.provider.hasVision()) {
       try {
-        screenshotState = await this.explorer.capturePageWithScreenshot();
+        screenshotState = await this.explorer.capture({ screenshot: true });
         if (screenshotState.screenshot) {
           visualAnalysis = (await this.researcher.answerQuestionAboutScreenshot(screenshotState, `Describe current page state relevant to: ${task.scenario}`)) || '';
         }
@@ -154,7 +163,7 @@ export class Pilot implements Agent {
     const messages = [
       {
         role: 'system' as const,
-        content: this.buildVerdictSystemPrompt(type, task),
+        content: this.buildVerdictSystemPrompt(task),
       },
       { role: 'user' as const, content: userContent },
     ];
@@ -175,7 +184,7 @@ export class Pilot implements Agent {
         tag('substep').log(`Pilot requesting verification: ${result.requestVerification}`);
         const verifyResult = await navigator.verifyState(result.requestVerification, currentState).catch(() => null);
         if (verifyResult?.verified && verifyResult.assertionSteps?.length) {
-          this.explorer.getPlaywrightRecorder().recordVerification(verifyResult.assertionSteps);
+          this.playwrightRecorder.recordVerification(verifyResult.assertionSteps);
         }
       }
 
@@ -301,10 +310,8 @@ export class Pilot implements Agent {
     }
   }
 
-  private buildSharedEvidenceRules(task: Test): string {
+  private buildSharedEvidenceRules(): string {
     return dedent`
-      SCENARIO: ${task.scenario}
-
       EVIDENCE PRIORITY (strict):
       1) Final observable state proving the scenario goal
       2) verify()/see() results in the LAST few actions before stop/finish
@@ -337,6 +344,12 @@ export class Pilot implements Agent {
 
       Expected results are MILESTONES, not the goal. Never fail because a milestone (toast, icon, styling)
       didn't match if the scenario goal IS accomplished.
+    `;
+  }
+
+  private buildTaskContext(task: Test): string {
+    return dedent`
+      SCENARIO: ${task.scenario}
 
       ${this.buildDeletionScope(task)}
 
@@ -351,7 +364,7 @@ export class Pilot implements Agent {
       iteration's work, but server-side side effects (records created, forms submitted) persist.
       Unnecessary resets create duplicate data and infinite loops.
 
-      ${this.buildSharedEvidenceRules(task)}
+      ${this.buildSharedEvidenceRules()}
 
       DECISION:
       - "allow": current page cannot host the scenario, irrecoverable error, or no path back.
@@ -368,17 +381,19 @@ export class Pilot implements Agent {
       to verify, how to record. Do not suggest repeating actions that already succeeded.
       If progress is blocked only because the page lacks target data for the scenario, prefer precondition()
       over repeated UI attempts.
+
+      ${this.buildTaskContext(task)}
     `;
   }
 
-  private buildVerdictSystemPrompt(type: string, task: Test): string {
+  private buildVerdictSystemPrompt(task: Test): string {
     return dedent`
-      You are Pilot — final decision maker for test pass/fail. Tester requested ${type}. Review the
-      evidence and commit to a verdict; "continue" only when evidence is genuinely insufficient.
+      You are Pilot — final decision maker for test pass/fail. Review the evidence and commit to a
+      verdict; "continue" only when evidence is genuinely insufficient.
 
       ${capabilityGroundingRule}
 
-      ${this.buildSharedEvidenceRules(task)}
+      ${this.buildSharedEvidenceRules()}
 
       DECISION:
       - "pass": scenario goal is fully accomplished. Set requestVerification to a one-sentence claim about
@@ -397,6 +412,8 @@ export class Pilot implements Agent {
       reason field: one short sentence, maximum 120 characters. Do NOT restate the decision
       ("scenario goal achieved/not achieved"). State what happened: what was verified, what failed,
       or what evidence was found.
+
+      ${this.buildTaskContext(task)}
     `;
   }
 
@@ -474,9 +491,6 @@ export class Pilot implements Agent {
       .slice(-this.stepsToReview);
     const actionsContext = this.formatActions(toolCalls);
 
-    this.conversation.cleanupTag('page_summary', '...trimmed...', 1);
-    this.conversation.cleanupTag('recent_actions', '...trimmed...', 2);
-
     return this.sendToPilot(
       dedent`
         Navigated to new page.
@@ -498,7 +512,8 @@ export class Pilot implements Agent {
 
         First: evaluate whether this navigation makes sense for the scenario goal. If the page is unrelated, instruct Tester to back() or reset(). Then plan next steps.
       `,
-      'pilot.reviewNewPage'
+      'pilot.reviewNewPage',
+      { task }
     );
   }
 
@@ -515,8 +530,6 @@ export class Pilot implements Agent {
     const actionsContext = this.formatActions(toolCalls);
     const stateContext = this.buildStateContext(currentState);
 
-    this.conversation.cleanupTag('recent_actions', '...trimmed...', 2);
-
     const hasFailures = toolCalls.length === 0 || toolCalls.some((t) => !t.wasSuccessful);
 
     const text = await this.sendToPilot(
@@ -554,7 +567,7 @@ export class Pilot implements Agent {
     return `CHECKED: ${checked.length > 0 ? checked.join(', ') : 'none'}\nREMAINING: ${remaining.length > 0 ? remaining.join(', ') : 'none'}`;
   }
 
-  private async sendToPilot(userText: string, functionId: string, opts: { tools?: boolean; maxToolRoundtrips?: number; task?: Test } = {}): Promise<string> {
+  private async sendToPilot(userText: string, functionId: string, opts: { tools?: boolean; maxToolRoundtrips?: number; task: Test }): Promise<string> {
     debugLog(`sendToPilot: ${functionId}, tools: ${!!opts.tools}, roundtrips: ${opts.maxToolRoundtrips ?? 0}`);
 
     let finalUserText = userText;
@@ -565,19 +578,14 @@ export class Pilot implements Agent {
       }
     }
     this.conversation!.addUserText(finalUserText);
-    let tools: any;
-    if (opts.tools) {
-      tools = this.pickPlanningTools();
-    }
 
-    if (opts.tools && opts.task) {
-      tools = { ...tools, ...this.buildPreconditionTool(opts.task) };
-    }
+    const tools = { ...this.pickPlanningTools(), ...this.buildPreconditionTool(opts.task) };
 
     const result = await this.provider.invokeConversation(this.conversation!, tools, {
       maxToolRoundtrips: opts.maxToolRoundtrips ?? 0,
+      toolChoice: opts.tools ? 'auto' : 'none',
       agentName: 'pilot',
-      stopWhen: opts.task ? () => opts.task!.hasFinished : undefined,
+      stopWhen: () => opts.task.hasFinished,
       telemetry: { functionId },
     });
     const text = result?.response?.text || '';
@@ -596,9 +604,9 @@ export class Pilot implements Agent {
   }
 
   private getExperienceToc(): string {
-    const state = this.explorer.getStateManager().getCurrentState();
+    const state = this.stateManager.getCurrentState();
     if (!state) return '';
-    return this.explorer.getStateManager().getExperienceTracker().renderExperienceTocFor(ActionResult.fromState(state));
+    return this.stateManager.getExperienceTracker().renderExperienceTocFor(ActionResult.fromState(state));
   }
 
   private pickPlanningTools() {
@@ -661,7 +669,7 @@ export class Pilot implements Agent {
   private async checkDataAvailability(task: Test, requestedData: string, fishermanReason: string | undefined): Promise<string | null> {
     if (!this.provider.hasVision()) return null;
 
-    const screenshotState = await this.explorer.capturePageWithScreenshot().catch(() => null);
+    const screenshotState = await this.explorer.capture({ screenshot: true }).catch(() => null);
     if (!screenshotState?.screenshot) return null;
 
     const question = dedent`
@@ -713,8 +721,8 @@ export class Pilot implements Agent {
       lines.push('modal: none');
     }
 
-    if (this.explorer.hasOtherTabs()) {
-      const tabs = this.explorer.getOtherTabsInfo();
+    const tabs = this.stateManager.otherTabs;
+    if (tabs.length > 0) {
       lines.push(`other tabs: ${tabs.length} (${tabs.map((t) => `${t.url} - ${t.title}`).join(', ')})`);
     } else {
       lines.push('other tabs: none');
@@ -737,7 +745,7 @@ export class Pilot implements Agent {
       lines.push('console errors: none');
     }
 
-    const failedRequests = this.explorer.getRequestStore()?.getFailedRequests() ?? [];
+    const failedRequests = this.requestStore.getFailedRequests();
     if (failedRequests.length > 0) {
       const sample = failedRequests
         .slice(-5)
@@ -818,7 +826,7 @@ export class Pilot implements Agent {
 
   private formatSessionLog(testerConversation: Conversation): string {
     const executions = testerConversation.getToolExecutions().filter((t) => !META_TOOLS.includes(t.toolName));
-    const stateHistory = this.explorer.getStateManager().getStateHistory();
+    const stateHistory = this.stateManager.getStateHistory();
 
     const initialUrl = stateHistory[0]?.toState?.url || '';
     let currentUrl = initialUrl;
@@ -975,16 +983,6 @@ export class Pilot implements Agent {
     return dedent`
       You are Pilot — a supervisor that detects problems and intervenes only when needed.
 
-      SCENARIO: ${task.scenario}
-      START URL: ${initialState.url}
-      PAGE: ${initialState.title || ''} | ${initialState.h1 || ''}
-
-      EXPECTED RESULTS:
-      ${task.expected.map((e) => `- ${e}`).join('\n')}
-
-      PLANNED STEPS:
-      ${stepsText}
-
       Your job: plan, review new pages, detect stuck patterns, suggest concrete next steps. Track which
       expectations are checked. When things go well, encourage briefly and let Tester continue. The current
       page is usually richer than the page summary lists — prefer exploring it before navigating away.
@@ -1054,6 +1052,16 @@ export class Pilot implements Agent {
       NEXT: <specific actionable instruction for Tester>
 
       Keep user-facing reasons concise: one short sentence, maximum 120 characters, evidence only, no repeated verdict wording.
+
+      SCENARIO: ${task.scenario}
+      START URL: ${initialState.url}
+      PAGE: ${initialState.title || ''} | ${initialState.h1 || ''}
+
+      EXPECTED RESULTS:
+      ${task.expected.map((e) => `- ${e}`).join('\n')}
+
+      PLANNED STEPS:
+      ${stepsText}
     `;
   }
 }

package/src/ai/planner.ts

@@ -14,7 +14,7 @@ import { createDebug, tag } from '../utils/logger.js';
 import { jsonToTable } from '../utils/markdown-parser.ts';
 import { mdq } from '../utils/markdown-query.js';
 import { planToCompactAiContext } from '../utils/test-plan-markdown.ts';
-import type { Agent } from './agent.js';
+import type { Agent, AgentDeps } from './agent.js';
 import { Conversation } from './conversation.ts';
 import type { Fisherman } from './fisherman.ts';
 import { WithSessionDedup } from './planner/session-dedup.ts';
@@ -63,13 +63,13 @@ export class Planner extends PlannerBase implements Agent {
   researcher: Researcher;
   private fisherman: Fisherman | null = null;
 
-  constructor(explorer: Explorer, provider: Provider, researcher: Researcher) {
+  constructor(deps: AgentDeps, researcher: Researcher) {
     super();
-    this.explorer = explorer;
-    this.provider = provider;
+    this.explorer = deps.explorer;
+    this.provider = deps.ai;
     this.researcher = researcher;
-    this.stateManager = explorer.getStateManager();
-    this.experienceTracker = explorer.getStateManager().getExperienceTracker();
+    this.stateManager = deps.stateManager;
+    this.experienceTracker = deps.stateManager.getExperienceTracker();
   }
 
   setFisherman(fisherman: Fisherman): void {
@@ -374,16 +374,10 @@ export class Planner extends PlannerBase implements Agent {
       ${dataProtectionRules}
       ${fileUploadRule}
       </rules>
-
-      ${this.buildApproach(style)}
-
-      <context>
-      URL: ${state.url || 'Unknown'}
-      Title: ${state.title || 'Unknown'}
-      </context>
     `;
 
     conversation.addUserText(planningPrompt);
+    conversation.addUserText(this.getTasksMessage());
     const currentState = this.stateManager.getCurrentState();
     const research = await this.researcher.research(currentState || state, {
       deep: true,
@@ -417,6 +411,15 @@ export class Planner extends PlannerBase implements Agent {
       </page_research>
     `);
 
+    conversation.addUserText(dedent`
+      ${this.buildApproach(style)}
+
+      <context>
+      URL: ${state.url || 'Unknown'}
+      Title: ${state.title || 'Unknown'}
+      </context>
+    `);
+
     if (this.fisherman) {
       await this.fisherman.ensureReady(state.url);
       if (this.fisherman.isAvailable()) {
@@ -568,8 +571,11 @@ export class Planner extends PlannerBase implements Agent {
       `);
     }
 
-    const hasCurrentPlan = !!this.currentPlan;
-    const tasksMessage = dedent`
+    return conversation;
+  }
+
+  private getTasksMessage(): string {
+    return dedent`
     <task>
       Provide testing scenarios as structured data with the following requirements:
       1. Create a short, descriptive plan name that summarizes what will be tested (e.g., "User Authentication Testing", "Product Catalog Navigation", "Form Validation Tests")
@@ -615,12 +621,8 @@ export class Planner extends PlannerBase implements Agent {
          - Do not wrap text in ** or * quotes, ( or ) brackets.
          - Avoid using emojis or special characters.
       7. Only tests that can be tested from web UI should be proposed.
-      ${hasCurrentPlan ? '8. CRITICAL: Return ONLY NEW scenarios not in the existing tests list. Return empty array if no new tests needed.' : `8. At least ${this.MIN_TASKS} tests should be proposed.`}
+      8. For a fresh plan propose at least ${this.MIN_TASKS} tests; when expanding an existing plan return ONLY new scenarios not in the tested list, and an empty array if none remain.
     </task>
     `;
-
-    conversation.addUserText(tasksMessage);
-
-    return conversation;
   }
 }

package/src/ai/provider.ts

@@ -97,7 +97,6 @@ export class Provider {
       await generateText({
         model: this.config.model,
         prompt: 'hi',
-        maxOutputTokens: 1,
       });
     } catch (error: any) {
       throw new AiError(`AI connection failed: ${error.message}`);

package/src/ai/quartermaster.ts

@@ -3,6 +3,7 @@ import { join } from 'node:path';
 import { z } from 'zod';
 import type { ActionResult } from '../action-result.ts';
 import { outputPath } from '../config.ts';
+import type Explorer from '../explorer.ts';
 import type { StateManager, StateTransition, WebPageState } from '../state-manager.ts';
 import type { Task } from '../test-plan.ts';
 import { createDebug, tag } from '../utils/logger.ts';
@@ -18,7 +19,7 @@ export class Quartermaster {
   private outputDir: string;
   private pageAnalyses: Map<string, PageAnalysis> = new Map();
   private unsubscribe: (() => void) | null = null;
-  private playwrightHelper: any = null;
+  private explorer: Explorer | null = null;
   private pendingAnalyses: Promise<void>[] = [];
 
   constructor(provider: Provider, options?: { model?: any }) {
@@ -28,8 +29,8 @@ export class Quartermaster {
     this.outputDir = outputPath('a11y');
   }
 
-  start(playwrightHelper: any, stateManager: StateManager): void {
-    this.playwrightHelper = playwrightHelper;
+  start(explorer: Explorer, stateManager: StateManager): void {
+    this.explorer = explorer;
     mkdirSync(this.outputDir, { recursive: true });
 
     this.unsubscribe = stateManager.onStateChange((event) => {
@@ -60,7 +61,7 @@ export class Quartermaster {
   }
 
   private async runAxeAnalysis(state: WebPageState): Promise<void> {
-    const page = this.playwrightHelper?.page;
+    const page = this.explorer?.page;
     if (!page || !state.hash) {
       debugLog('No page available for axe analysis');
       return;

package/src/ai/rerunner.ts

@@ -12,16 +12,13 @@ import figureSet from 'figures';
 import { z } from 'zod';
 import { ActionResult } from '../action-result.ts';
 import { setActivity } from '../activity.ts';
-import type { ExperienceTracker } from '../experience-tracker.ts';
-import type Explorer from '../explorer.ts';
-import type { KnowledgeTracker } from '../knowledge-tracker.ts';
 import { Stats } from '../stats.ts';
 import { Task, Test, TestResult } from '../test-plan.ts';
 import { formatHeadings } from '../utils/context-formatter.ts';
 import { createDebug, tag } from '../utils/logger.ts';
 import { loop } from '../utils/loop.ts';
 import { RulesLoader } from '../utils/rules-loader.ts';
-import type { Agent } from './agent.ts';
+import type { Agent, AgentDeps } from './agent.ts';
 import { toolExecutionLabel } from './conversation.ts';
 import type { Navigator } from './navigator.ts';
 import { Provider } from './provider.ts';
@@ -35,17 +32,13 @@ export class Rerunner extends TaskAgent implements Agent {
   protected readonly ACTION_TOOLS = ['click', 'pressKey', 'form'];
   emoji = '🔄';
 
-  private explorer: Explorer;
-  private provider: Provider;
   private agentTools: any;
   private healedSteps: Array<{ original: string; healed: string }> = [];
   private traceDir = '';
   private static pluginsWired = false;
 
-  constructor(explorer: Explorer, provider: Provider, agentTools?: any) {
-    super();
-    this.explorer = explorer;
-    this.provider = provider;
+  constructor(deps: AgentDeps, agentTools?: any) {
+    super(deps);
     this.agentTools = agentTools;
   }
 
@@ -53,20 +46,8 @@ export class Rerunner extends TaskAgent implements Agent {
     throw new Error('Rerunner does not use Navigator');
   }
 
-  protected getExperienceTracker(): ExperienceTracker {
-    return this.explorer.getStateManager().getExperienceTracker();
-  }
-
-  protected getKnowledgeTracker(): KnowledgeTracker {
-    return this.explorer.getKnowledgeTracker();
-  }
-
-  protected getProvider(): Provider {
-    return this.provider;
-  }
-
   private get rerunnerConfig(): Record<string, any> {
-    return (this.explorer.getConfig().ai?.agents?.rerunner as any) || {};
+    return (this.config.ai?.agents?.rerunner as any) || {};
   }
 
   private get healLimit(): number {
@@ -325,7 +306,7 @@ export class Rerunner extends TaskAgent implements Agent {
       });
 
       const healTask = new Task(`Heal: ${failedCode}`);
-      const codeceptTools = createCodeceptJSTools(this.explorer, healTask);
+      const codeceptTools = createCodeceptJSTools(this.toolDeps, healTask);
 
       let healed = false;
       let healedCommand = '';
@@ -345,9 +326,9 @@ export class Rerunner extends TaskAgent implements Agent {
               healTask.addNote(note);
               tag('substep').log(note);
             }
-            const action = this.explorer.createAction();
+            const action = this.explorer.action();
             await action.execute(`I.wait(${seconds})`);
-            const state = this.explorer.getStateManager().getCurrentState();
+            const state = this.stateManager.getCurrentState();
             const ar = state ? ActionResult.fromState(state) : null;
             return {
               success: true,
@@ -438,8 +419,8 @@ export class Rerunner extends TaskAgent implements Agent {
   }
 
   private getHealSystemPrompt(): string {
-    const customRules = this.provider.getSystemPromptForAgent('rerunner', this.explorer.getStateManager().getCurrentState()?.url) || '';
-    const currentUrl = this.explorer.getStateManager().getCurrentState()?.url || '';
+    const customRules = this.provider.getSystemPromptForAgent('rerunner', this.stateManager.getCurrentState()?.url) || '';
+    const currentUrl = this.stateManager.getCurrentState()?.url || '';
     const approach = RulesLoader.loadRules('rerunner', ['healing-approach'], currentUrl);
 
     return dedent`
@@ -474,7 +455,7 @@ export class Rerunner extends TaskAgent implements Agent {
   }
 
   private getHealUserPrompt(failedCode: string, error: Error): string {
-    const state = this.explorer.getStateManager().getCurrentState();
+    const state = this.stateManager.getCurrentState();
     const actionResult = state ? ActionResult.fromState(state) : null;
 
     const headings = formatHeadings(state || {});

package/src/ai/researcher/coordinates.ts

@@ -4,6 +4,7 @@ import type { ActionResult } from '../../action-result.js';
 import type Explorer from '../../explorer.ts';
 import { tag } from '../../utils/logger.js';
 import { mdq } from '../../utils/markdown-query.ts';
+import { eidxByLocator } from '../../utils/web-eidx.ts';
 import { WebElement } from '../../utils/web-element.ts';
 import type { Provider } from '../provider.js';
 import { type Constructor, debugLog } from './mixin.ts';
@@ -81,7 +82,7 @@ export function WithCoordinates<T extends Constructor>(Base: T) {
     }
 
     async visuallyAnnotateElements(opts?: { containers?: Array<{ css: string; label: string }> }): Promise<number> {
-      return this.explorer.visuallyAnnotateElements(opts);
+      return this.explorer.withPage((page) => visuallyAnnotateContainers(page, opts?.containers || []));
     }
 
     private async _analyzeScreenshotForVisualProps(): Promise<VisualAnalysisResult> {
@@ -177,7 +178,7 @@ export function WithCoordinates<T extends Constructor>(Base: T) {
           let eidx = el.eidx || null;
           if (!eidx) {
             const locator = el.css || el.xpath || (el.aria ? `role=${el.aria.role}[name="${el.aria.text}"]` : null);
-            if (locator) eidx = await this.explorer.getEidxByLocator(locator, section.containerCss);
+            if (locator) eidx = await this.explorer.withPage((page) => eidxByLocator(page, locator, section.containerCss));
           }
           if (!eidx) continue;
 
@@ -202,7 +203,7 @@ export function WithCoordinates<T extends Constructor>(Base: T) {
       }
       if (eidxWithoutCoords.length === 0) return;
 
-      const webElements = await this.explorer.runWithBrowserRecovery('backfillCoordinates', () => WebElement.fromEidxList(this.explorer.playwrightHelper.page, eidxWithoutCoords));
+      const webElements = await this.explorer.withPage((page) => WebElement.fromEidxList(page, eidxWithoutCoords));
       if (webElements.length === 0) return;
 
       const rectMap = new Map(webElements.map((w) => [w.eidx!, w]));

package/src/ai/researcher/deep-analysis.ts

@@ -1,5 +1,6 @@
 import dedent from 'dedent';
 import { ActionResult, type Diff } from '../../action-result.js';
+import type { ExplorbotConfig } from '../../config.ts';
 import { executionController } from '../../execution-controller.ts';
 import type Explorer from '../../explorer.ts';
 import type { StateManager } from '../../state-manager.js';
@@ -21,13 +22,14 @@ export function WithDeepAnalysis<T extends Constructor>(Base: T) {
     declare explorer: Explorer;
     declare provider: Provider;
     declare stateManager: StateManager;
+    declare config: ExplorbotConfig;
     declare actionResult: ActionResult | undefined;
 
     async performDeepAnalysis(state: WebPageState, result: ResearchResult): Promise<void> {
       tag('info').log('Starting deep analysis of expandable elements');
       await (this as any).navigateTo(state.fullUrl || state.url);
 
-      const maxClicks = (this.explorer.getConfig().ai?.agents?.researcher as any)?.maxExpandableClicks ?? DEFAULT_MAX_EXPANDABLE_CLICKS;
+      const maxClicks = (this.config.ai?.agents?.researcher as any)?.maxExpandableClicks ?? DEFAULT_MAX_EXPANDABLE_CLICKS;
 
       const expandedSections: string[] = [];
       const navigationLinks: Array<{ code: string; url: string }> = [];
@@ -358,10 +360,10 @@ export function WithDeepAnalysis<T extends Constructor>(Base: T) {
           const isCoordinateClick = el.commands[0].startsWith('I.clickXY(');
           if (!isCoordinateClick) {
             const hoverCmd = el.commands[0].replace('I.click(', 'I.moveCursorTo(');
-            await this.explorer.attemptAction(hoverCmd, undefined);
+            await this.explorer.action().attempt(hoverCmd);
             await new Promise((r) => setTimeout(r, 500));
 
-            await this.explorer.capturePageState();
+            await this.explorer.capture();
             const hoverAR = ActionResult.fromState(this.stateManager.getCurrentState()!);
             const hoverDiff = await hoverAR.diff(previousState);
             const hoverHtmlSize = hoverDiff.htmlParts.reduce((sum, p) => sum + p.subtree.length, 0);
@@ -401,7 +403,7 @@ export function WithDeepAnalysis<T extends Constructor>(Base: T) {
       const previousState = ActionResult.fromState(this.stateManager.getCurrentState()!);
 
       let clickCode: string | null = null;
-      const action = this.explorer.createAction();
+      const action = this.explorer.action();
       for (const cmd of commands) {
         if (await action.attempt(cmd, undefined)) {
           clickCode = cmd;
@@ -417,7 +419,7 @@ export function WithDeepAnalysis<T extends Constructor>(Base: T) {
 
       let diff: Diff;
       try {
-        await this.explorer.createAction().capturePageState();
+        await this.explorer.capture();
         const currAR = ActionResult.fromState(this.stateManager.getCurrentState()!);
         diff = await currAR.diff(previousState);
       } catch (err) {
@@ -448,7 +450,7 @@ export function WithDeepAnalysis<T extends Constructor>(Base: T) {
     private async _restorePageState(url: string, originalAria: string): Promise<void> {
       try {
         await (this as any).cancelInUi();
-        await this.explorer.capturePageState();
+        await this.explorer.capture();
         const currentAria = this.stateManager.getCurrentState()?.ariaSnapshot || '';
         if (!diffAriaSnapshots(originalAria, currentAria).text) return;
       } catch (err) {