explorbot 0.1.32-beta.1 → 0.2.1

package/src/ai/historian.ts

@@ -1,6 +1,7 @@
 import { readFileSync, writeFileSync } from 'node:fs';
 import type { ExplorbotConfig } from '../config.ts';
-import { ExperienceTracker } from '../experience-tracker.ts';
+import type { ExperienceTracker } from '../experience-tracker.ts';
+import type Explorer from '../explorer.ts';
 import type { PlaywrightRecorder } from '../playwright-recorder.ts';
 import type { Reporter } from '../reporter.ts';
 import type { StateManager } from '../state-manager.ts';
@@ -13,8 +14,6 @@ import { type PlaywrightMethods, WithPlaywright } from './historian/playwright.t
 import { type ScreencastMethods, WithScreencast } from './historian/screencast.ts';
 import type { Provider } from './provider.ts';
 
-export { isNonReusableCode } from '../utils/step-analyzer.ts';
-
 const HistorianBase = WithScreencast(WithPlaywright(WithCodeceptJS(WithExperience(Object as unknown as new (...args: any[]) => object))));
 
 export interface Historian extends ExperienceMethods, CodeceptJSMethods, PlaywrightMethods, ScreencastMethods {}
@@ -25,13 +24,13 @@ export class Historian extends HistorianBase {
   declare reporter: Reporter | undefined;
   declare stateManager: StateManager | undefined;
   declare config: ExplorbotConfig | undefined;
-  declare playwright: { recorder: PlaywrightRecorder; helper: any } | undefined;
+  declare playwright: { recorder: PlaywrightRecorder; explorer: Explorer } | undefined;
   declare savedFiles: Set<string>;
 
-  constructor(provider: Provider, experienceTracker?: ExperienceTracker, reporter?: Reporter, stateManager?: StateManager, config?: ExplorbotConfig, playwright?: { recorder: PlaywrightRecorder; helper: any }) {
+  constructor(provider: Provider, experienceTracker: ExperienceTracker, reporter?: Reporter, stateManager?: StateManager, config?: ExplorbotConfig, playwright?: { recorder: PlaywrightRecorder; explorer: Explorer }) {
     super();
     this.provider = provider;
-    this.experienceTracker = experienceTracker || new ExperienceTracker();
+    this.experienceTracker = experienceTracker;
     this.reporter = reporter;
     this.stateManager = stateManager;
     this.config = config;
@@ -52,11 +51,10 @@ export class Historian extends HistorianBase {
     return this.isPlaywrightFramework() ? this.savePlaywrightPlanToFile(plan) : this.saveCodeceptPlanToFile(plan);
   }
 
-  rewriteScenarioInFile(filePath: string, healedSteps: Array<{ test: string; original: string; healed: string }>): void {
+  rewriteScenarioInFile(filePath: string, healedSteps: Array<{ original: string; healed: string }>): void {
     let content = readFileSync(filePath, 'utf-8');
 
     for (const step of healedSteps) {
-      if (!content.includes(step.original)) continue;
       content = content.replace(step.original, step.healed);
     }
 

package/src/ai/navigator.ts

@@ -3,31 +3,30 @@ import dedent from 'dedent';
 import { z } from 'zod';
 import { ActionResult } from '../action-result.js';
 import type Action from '../action.ts';
-import { ExperienceTracker, renderExperienceToc } from '../experience-tracker.js';
+import type { ExplorbotConfig } from '../config.ts';
+import type { ExperienceTracker } from '../experience-tracker.js';
 import Explorer from '../explorer.ts';
-import { KnowledgeTracker } from '../knowledge-tracker.js';
-import { type WebPageState, normalizeUrl } from '../state-manager.js';
+import type { KnowledgeTracker } from '../knowledge-tracker.js';
+import { type StateManager, normalizeUrl } from '../state-manager.js';
 import { extractCodeBlocks } from '../utils/code-extractor.js';
 import { HooksRunner } from '../utils/hooks-runner.ts';
 import { createDebug, pluralize, tag } from '../utils/logger.js';
 import { loop, pause } from '../utils/loop.js';
 import { RulesLoader } from '../utils/rules-loader.ts';
 import { extractStatePath } from '../utils/url-matcher.js';
-import type { Agent } from './agent.js';
+import type { Agent, AgentDeps } from './agent.js';
 import type { Conversation } from './conversation.js';
-import { ExperienceCompactor } from './experience-compactor.js';
 import type { Provider } from './provider.js';
 import { Researcher } from './researcher.ts';
 import { actionRule, locatorRule, unexpectedPopupRule } from './rules.js';
 import { isInteractive } from './task-agent.js';
-import { createAgentTools } from './tools.ts';
+import { createLearnExperienceTool } from './tools.ts';
 
 const debugLog = createDebug('explorbot:navigator');
 
 class Navigator implements Agent {
   emoji = '🧭';
   private provider: Provider;
-  private experienceCompactor: ExperienceCompactor;
   private knowledgeTracker: KnowledgeTracker;
   private experienceTracker: ExperienceTracker;
   private hooksRunner: HooksRunner;
@@ -72,26 +71,29 @@ class Navigator implements Agent {
   </rules>
   `;
   private explorer: Explorer;
-
-  constructor(explorer: Explorer, provider: Provider, experienceCompactor: ExperienceCompactor, experienceTracker?: ExperienceTracker) {
-    this.provider = provider;
-    this.explorer = explorer;
-    this.experienceCompactor = experienceCompactor;
-    this.knowledgeTracker = new KnowledgeTracker();
-    this.experienceTracker = experienceTracker || new ExperienceTracker();
-    this.hooksRunner = new HooksRunner(explorer, explorer.getConfig());
+  private config: ExplorbotConfig;
+  private stateManager: StateManager;
+
+  constructor(deps: AgentDeps) {
+    this.provider = deps.ai;
+    this.explorer = deps.explorer;
+    this.config = deps.config;
+    this.stateManager = deps.stateManager;
+    this.knowledgeTracker = deps.knowledgeTracker;
+    this.experienceTracker = deps.stateManager.getExperienceTracker();
+    this.hooksRunner = new HooksRunner(deps.explorer, deps.config);
   }
 
   private get verifyAttempts(): number {
-    return this.explorer.getConfig().ai?.agents?.navigator?.verifyAttempts ?? 3;
+    return this.config.ai?.agents?.navigator?.verifyAttempts ?? 3;
   }
 
   private get verifyTimeout(): number {
-    return this.explorer.getConfig().ai?.agents?.navigator?.verifyTimeout ?? 1500;
+    return this.config.ai?.agents?.navigator?.verifyTimeout ?? 1500;
   }
 
   private getBaseOrigin(): string | null {
-    const baseUrl = this.explorer.getConfig().playwright.url;
+    const baseUrl = this.config.playwright.url;
     try {
       return new URL(baseUrl).origin;
     } catch {
@@ -136,12 +138,12 @@ class Navigator implements Agent {
   }
 
   async visit(url: string): Promise<void> {
-    return this.explorer.runWithBrowserRecovery('navigator.visit', () => this.visitOnce(url));
+    return this.visitOnce(url);
   }
 
   private async visitOnce(url: string): Promise<void> {
     try {
-      const action = this.explorer.createAction();
+      const action = this.explorer.action();
 
       await action.execute(`I.amOnPage('${url}')`);
 
@@ -174,7 +176,7 @@ class Navigator implements Agent {
           throw new Error(`Navigation to ${url} failed: ${action.lastError?.message}`);
         }
       }
-      await this.explorer.capturePageWithScreenshot();
+      await this.explorer.capture({ screenshot: true });
       await this.hooksRunner.runAfterHook('navigator', url);
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
@@ -191,22 +193,12 @@ class Navigator implements Agent {
     tag('info').log('AI Navigator resolving state at', actionResult.url);
     debugLog('Resolution message:', message);
 
-    const action = opts?.action ?? this.explorer.createAction();
+    const action = opts?.action ?? this.explorer.action();
     const expectedUrl = opts?.expectedUrl;
 
-    let knowledge = '';
+    const knowledge = this.knowledgeTracker.renderRelevantKnowledge(actionResult);
     let experience = '';
 
-    const relevantKnowledge = this.knowledgeTracker.getRelevantKnowledge(actionResult);
-    if (relevantKnowledge.length > 0) {
-      const knowledgeContent = relevantKnowledge.map((k) => k.content).join('\n\n');
-      knowledge = `
-      <hint>
-      Here is relevant knowledge for this page:
-      ${knowledgeContent}
-      </hint>`;
-    }
-
     if (!actionResult.isInsideIframe) {
       const successful = this.experienceTracker.getSuccessfulExperience(actionResult);
       if (successful.length > 0) {
@@ -354,7 +346,7 @@ class Navigator implements Agent {
         codeBlockIndex++;
         totalAttempts++;
 
-        await this.explorer.switchToMainFrame();
+        await action.exitIframe();
 
         const prevActionResult = action.actionResult ?? actionResult;
         const prevHash = prevActionResult.getStateHash();
@@ -386,7 +378,7 @@ class Navigator implements Agent {
               // URL did not transition to expectedUrl within timeout
             }
           }
-          const freshState = await this.explorer.capturePageState();
+          const freshState = await this.explorer.capture();
           const currentUrl = /^https?:\/\//i.test(expectedUrl) ? freshState.fullUrl || freshState.url || '' : freshState.url || '';
           const urlMatches = this.isSameExpectedOrigin(expectedUrl, action.stateManager) && normalizeUrl(currentUrl) === normalizeUrl(expectedUrl);
           const stateChanged = freshState.getStateHash() !== actionResult.getStateHash();
@@ -397,7 +389,6 @@ class Navigator implements Agent {
             if (freshState.getStateHash() !== prevHash) {
               try {
                 const diff = await freshState.diff(prevActionResult);
-                await diff.calculate();
                 ariaChanges = diff.ariaChanged;
               } catch (err) {
                 debugLog('Failed to compute pageDiff for failed URL verification:', err);
@@ -486,24 +477,17 @@ class Navigator implements Agent {
   }
 
   private buildExperienceTools(): { learnExperience: unknown } | undefined {
-    const stateManager = this.explorer.getStateManager();
+    if (!this.experienceTracker) return undefined;
+    const stateManager = this.stateManager;
     const getState = () => {
       const s = stateManager.getCurrentState();
       return s ? ActionResult.fromState(s) : null;
     };
-    const { learnExperience } = createAgentTools({
-      explorer: this.explorer,
-      researcher: null as unknown as Researcher,
-      navigator: this,
-      experienceTracker: this.experienceTracker,
-      getState,
-    });
-    if (!learnExperience) return undefined;
-    return { learnExperience };
+    return { learnExperience: createLearnExperienceTool({ getExperienceTracker: () => this.experienceTracker, getState }) };
   }
 
   async freeSail(opts?: { strategy?: 'deep' | 'shallow'; scope?: string; visitedUrls?: Set<string> }, actionResult?: ActionResult): Promise<{ target: string; reason: string } | null> {
-    const stateManager = this.explorer.getStateManager();
+    const stateManager = this.stateManager;
     const state = stateManager.getCurrentState();
     if (!state) {
       return null;
@@ -641,26 +625,11 @@ class Navigator implements Agent {
       return { verified: cachedVerification, successfulCodes: [], assertionSteps: [], totalAttempted: 0 };
     }
 
-    let knowledge = '';
+    const knowledge = this.knowledgeTracker.renderRelevantKnowledge(actionResult);
     let experience = '';
 
-    const relevantKnowledge = this.knowledgeTracker.getRelevantKnowledge(actionResult);
-    if (relevantKnowledge.length > 0) {
-      const knowledgeContent = relevantKnowledge.map((k) => k.content).join('\n\n');
-      knowledge = `
-      <hint>
-      Here is relevant knowledge for this page:
-      ${knowledgeContent}
-      </hint>`;
-    }
-
     if (!actionResult.isInsideIframe) {
-      const toc = this.experienceTracker.getExperienceTableOfContents(actionResult);
-      if (toc.length > 0) {
-        const totalSections = toc.reduce((sum, entry) => sum + entry.sections.length, 0);
-        tag('operation').log(`Found ${toc.length} experience ${pluralize(toc.length, 'file')} (${totalSections} sections) for: ${actionResult.url}`);
-        experience = renderExperienceToc(toc);
-      }
+      experience = this.experienceTracker.renderExperienceTocFor(actionResult);
     }
 
     const priorVerifications = Object.entries(actionResult.verifications ?? {});
@@ -726,11 +695,11 @@ class Navigator implements Agent {
     const successfulCodes: string[] = [];
     const assertionSteps: Array<{ name: string; args: any[] }> = [];
 
-    const action = this.explorer.createAction();
+    const action = this.explorer.action();
     let failures = 0;
 
-    const page = this.explorer.playwrightHelper?.page;
-    const originalTimeout = this.explorer.playwrightHelper?.options?.timeout ?? 3000;
+    const page = this.explorer.page;
+    const originalTimeout = this.config.playwright.timeout ?? 3000;
     page?.setDefaultTimeout(this.verifyTimeout);
 
     try {
@@ -762,9 +731,9 @@ class Navigator implements Agent {
             return;
           }
 
-          await this.explorer.switchToMainFrame();
+          await action.exitIframe();
 
-          const verified = await action.attempt(codeBlock, message, false);
+          const verified = await action.attempt(codeBlock, message);
 
           if (verified) {
             tag('success').log('Verification passed');
@@ -800,7 +769,7 @@ class Navigator implements Agent {
     if (alreadyVerified) verified = true;
 
     actionResult.addVerification(message, verified);
-    this.explorer.getStateManager().updateState(actionResult);
+    this.stateManager.updateState(actionResult);
 
     return { verified, successfulCodes, assertionSteps, totalAttempted };
   }

package/src/ai/pilot.ts

@@ -2,9 +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 ExperienceTracker, renderExperienceToc } from '../experience-tracker.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';
@@ -12,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';
@@ -31,15 +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;
-  private experienceTracker: ExperienceTracker | null;
 
-  constructor(provider: Provider, agentTools: any, researcher: Researcher, explorer: Explorer, experienceTracker?: ExperienceTracker) {
-    this.provider = provider;
+  constructor(deps: AgentDeps, agentTools: any, researcher: Researcher) {
+    this.provider = deps.ai;
     this.agentTools = agentTools;
     this.researcher = researcher;
-    this.explorer = explorer;
-    this.experienceTracker = experienceTracker || null;
+    this.explorer = deps.explorer;
+    this.stateManager = deps.stateManager;
+    this.requestStore = deps.requestStore;
+    this.playwrightRecorder = deps.playwrightRecorder;
   }
 
   setFisherman(fisherman: Fisherman): void {
@@ -94,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}`)) || '';
         }
@@ -111,7 +117,7 @@ export class Pilot implements Agent {
         .string()
         .nullable()
         .describe(
-          'REQUIRED whenever decision is "pass" — a one-sentence natural-language claim about the current page that, if true, proves the scenario goal (e.g., "New test suite \\"Foo\\" is visible in the suites list"). NOT code: do not write I.*, expect(), .then(), grabTitle, or any JavaScript. Navigator translates the claim into CodeceptJS assertions and runs them; passing assertions are saved to the generated test file. Also use when evidence is insufficient before deciding pass/fail. Leave null for "continue", "fail", or "skipped".'
+          'REQUIRED whenever decision is "pass" — a one-sentence natural-language claim about the current page that, if true, proves the scenario goal (e.g., "New item \\"Foo\\" is visible in the items list"). NOT code: do not write I.*, expect(), .then(), grabTitle, or any JavaScript. Navigator translates the claim into CodeceptJS assertions and runs them; passing assertions are saved to the generated test file. Also use when evidence is insufficient before deciding pass/fail. Leave null for "continue", "fail", or "skipped".'
         ),
     });
 
@@ -147,7 +153,7 @@ export class Pilot implements Agent {
       - Mixed evidence + final state shows success → pass. Mixed + final state unclear → continue with guidance.
 
       When deciding "pass", you MUST also set requestVerification to a one-sentence natural-language
-      claim about the current page (e.g., "New test suite Foo is visible in the suites list"). NOT
+      claim about the current page (e.g., "New item Foo is visible in the items list"). NOT
       code — do not write I.*, expect(), .then(), or any JavaScript. Choose the strongest single
       piece of evidence (a unique element/text that exists ONLY because the scenario succeeded).
       Navigator translates the claim into CodeceptJS assertions; without it the generated test has
@@ -157,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 },
     ];
@@ -178,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);
         }
       }
 
@@ -304,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
@@ -340,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)}
 
@@ -354,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.
@@ -371,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
@@ -400,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)}
     `;
   }
 
@@ -429,10 +443,6 @@ export class Pilot implements Agent {
 
         FIRST: Decide if precondition() is needed.
 
-        ${capabilityGroundingRule}
-
-        ${dataProtectionRules}
-
         Call precondition() WHEN:
         - The scenario edits/deletes/modifies an item, and you want a DISPOSABLE item to act on safely
         - The scenario needs specific data clearly NOT on the current page (e.g., items with specific statuses for filtering)
@@ -481,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.
@@ -505,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 }
     );
   }
 
@@ -522,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(
@@ -561,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;
@@ -572,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 || '';
@@ -603,12 +604,9 @@ export class Pilot implements Agent {
   }
 
   private getExperienceToc(): string {
-    if (!this.experienceTracker) return '';
-    const state = this.explorer.getStateManager().getCurrentState();
+    const state = this.stateManager.getCurrentState();
     if (!state) return '';
-    const actionResult = ActionResult.fromState(state);
-    const toc = this.experienceTracker.getExperienceTableOfContents(actionResult);
-    return renderExperienceToc(toc);
+    return this.stateManager.getExperienceTracker().renderExperienceTocFor(ActionResult.fromState(state));
   }
 
   private pickPlanningTools() {
@@ -671,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`
@@ -723,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');
@@ -747,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)
@@ -828,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;
@@ -985,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.
@@ -1056,14 +1044,24 @@ export class Pilot implements Agent {
 
       ${dataProtectionRules}
 
-      Describe WHAT to create, not what exists. RIGHT: precondition("1 test"). WRONG:
-      precondition("1 test suite named Updated Suite with existing tests"). Keep descriptions short.
+      Describe WHAT to create, not what exists. RIGHT: precondition("1 post"). WRONG:
+      precondition("1 post named Updated Post with existing comments"). Keep descriptions short.
 
       Response format:
       PROGRESS: <1 sentence assessment>
       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}
     `;
   }
 }