explorbot 0.1.0 → 0.1.2

package/bin/explorbot-cli.ts

@@ -1,7 +1,9 @@
 #!/usr/bin/env bun
 import fs from 'node:fs';
 import path from 'node:path';
+import chalk from 'chalk';
 import { Command } from 'commander';
+import figureSet from 'figures';
 import { render } from 'ink';
 import React from 'react';
 import { App } from '../src/components/App.js';
@@ -104,14 +106,14 @@ async function showStatsAndExit(code: number): Promise<never> {
   process.exit(code);
 }
 
-addCommonOptions(program.command('start [path]').alias('sail').description('Start web exploration')).action(async (startPath, options) => {
+addCommonOptions(program.command('start [path]').description('Start web exploration')).action(async (startPath, options) => {
   setPreserveConsoleLogs(false);
   const explorBot = new ExplorBot(buildExplorBotOptions(startPath, options));
   await explorBot.start();
   await startTUI(explorBot);
 });
 
-addCommonOptions(program.command('explore <path>').description('Start web exploration (legacy command)').option('--max-tests <count>', 'Maximum number of tests to run')).action(async (explorePath, options) => {
+addCommonOptions(program.command('explore <path>').description('Explore a page autonomously and run invented scenarios').option('--max-tests <count>', 'Maximum number of tests to run')).action(async (explorePath, options) => {
   try {
     const explorBot = new ExplorBot(buildExplorBotOptions(explorePath, options));
     await explorBot.start();
@@ -159,6 +161,23 @@ addCommonOptions(program.command('plan <path>').description('Generate test plan
         await showStatsAndExit(1);
       }
 
+      const suite = explorBot.getSuite();
+      if (suite && suite.automatedTestCount > 0) {
+        const names = suite.getAutomatedTestNames();
+        console.log(`\n${chalk.bold.cyan(`Already implemented (${names.length} tests)`)}`);
+        for (let i = 0; i < names.length; i++) {
+          console.log(`  ${chalk.dim(`${i + 1}.`)} ${chalk.green(figureSet.pointer)} ${names[i]}`);
+        }
+      }
+
+      if (plan?.tests.length) {
+        console.log(`\n${chalk.bold.cyan(`New test scenarios (${plan.tests.length})`)}`);
+        for (let i = 0; i < plan.tests.length; i++) {
+          const t = plan.tests[i];
+          console.log(`  ${chalk.dim(`${i + 1}.`)} ${chalk.green(figureSet.pointer)} ${t.scenario} ${chalk.dim(`[${t.priority}]`)}`);
+        }
+      }
+
       const savedPath = explorBot.savePlan();
       const planFile = savedPath ? path.basename(savedPath) : 'plan.md';
 
@@ -166,10 +185,14 @@ addCommonOptions(program.command('plan <path>').description('Generate test plan
       const cliSuffix = cliFlags ? ` ${cliFlags}` : '';
 
       const lines: string[] = [];
-      lines.push('Run tests:');
-      lines.push(`\`${cli} test ${planFile} 1${cliSuffix}\` → run first test`);
-      lines.push(`\`${cli} test ${planFile} 1-3${cliSuffix}\` → run tests 1 to 3`);
-      lines.push(`\`${cli} test ${planFile} *${cliSuffix}\` → run all tests`);
+      lines.push('Run commands:');
+      lines.push(`\`${cli} test ${planFile} 1${cliSuffix}\` → run first new test`);
+      lines.push(`\`${cli} test ${planFile} *${cliSuffix}\` → run all new tests`);
+      if (suite && suite.automatedTestCount > 0) {
+        for (const f of suite.getAutomatedTestFiles()) {
+          lines.push(`\`${cli} rerun ${path.relative(process.cwd(), f)}${cliSuffix}\` → re-run automated tests`);
+        }
+      }
 
       log(parseMarkdownToTerminal(lines.join('\n')));
 
@@ -281,6 +304,42 @@ addCommonOptions(program.command('test <planfile> [index]').description('Execute
   }
 });
 
+program
+  .command('runs [file]')
+  .description('List generated test files, or show steps for a specific file')
+  .option('-p, --path <path>', 'Working directory path')
+  .option('-c, --config <path>', 'Path to configuration file')
+  .action(async (file, options) => {
+    try {
+      await ConfigParser.getInstance().loadConfig({
+        config: options.config,
+        path: options.path || process.cwd(),
+      });
+      const explorBot = new ExplorBot({ path: options.path });
+      const { RunsCommand } = await import('../src/commands/runs-command.js');
+      await new RunsCommand(explorBot).execute(file || '');
+    } catch (error) {
+      console.error('Failed:', error instanceof Error ? error.message : 'Unknown error');
+      process.exit(1);
+    }
+  });
+
+addCommonOptions(program.command('rerun <filename> [index]').description('Re-run generated tests with AI auto-healing')).action(async (filename, index, options) => {
+  try {
+    const explorBot = new ExplorBot(buildExplorBotOptions(undefined, options));
+    await explorBot.start();
+    const { RerunCommand } = await import('../src/commands/rerun-command.js');
+    const cmd = new RerunCommand(explorBot);
+    const args = index ? `${filename} ${index}` : filename;
+    await cmd.execute(args);
+    await explorBot.stop();
+    await showStatsAndExit(0);
+  } catch (error) {
+    console.error('Failed:', error instanceof Error ? error.message : 'Unknown error');
+    await showStatsAndExit(1);
+  }
+});
+
 addCommonOptions(
   program
     .command('freesail [startUrl]')
@@ -377,7 +436,6 @@ program
 
 program
   .command('learn [url] [description]')
-  .alias('add-knowledge')
   .description('Add knowledge for URLs')
   .option('-p, --path <path>', 'Working directory path')
   .action(async (url, description, options) => {
@@ -448,32 +506,32 @@ addCommonOptions(program.command('research <url>').description('Research a page
   }
 );
 
-addCommonOptions(
-  program.command('drill <url>').alias('bosun').description('Drill all components on a page to learn interactions').option('--knowledge <path>', 'Save learned interactions to knowledge file at this URL path').option('--max <count>', 'Maximum number of components to drill', '20')
-).action(async (url, options) => {
-  try {
-    const explorBot = new ExplorBot(buildExplorBotOptions(url, options));
-    await explorBot.start();
+addCommonOptions(program.command('drill <url>').description('Drill all components on a page to learn interactions').option('--knowledge <path>', 'Save learned interactions to knowledge file at this URL path').option('--max <count>', 'Maximum number of components to drill', '20')).action(
+  async (url, options) => {
+    try {
+      const explorBot = new ExplorBot(buildExplorBotOptions(url, options));
+      await explorBot.start();
 
-    await explorBot.visit(url);
+      await explorBot.visit(url);
 
-    const plan = await explorBot.agentBosun().drill({
-      knowledgePath: options.knowledge,
-      maxComponents: Number.parseInt(options.max, 10),
-      interactive: false,
-    });
+      const plan = await explorBot.agentBosun().drill({
+        knowledgePath: options.knowledge,
+        maxComponents: Number.parseInt(options.max, 10),
+        interactive: false,
+      });
 
-    console.log(`\nDrill completed: ${plan.tests.length} components`);
-    console.log(`Successful: ${plan.tests.filter((t) => t.isSuccessful).length}`);
-    console.log(`Failed: ${plan.tests.filter((t) => t.hasFailed).length}`);
+      console.log(`\nDrill completed: ${plan.tests.length} components`);
+      console.log(`Successful: ${plan.tests.filter((t) => t.isSuccessful).length}`);
+      console.log(`Failed: ${plan.tests.filter((t) => t.hasFailed).length}`);
 
-    await explorBot.stop();
-    await showStatsAndExit(0);
-  } catch (error) {
-    console.error('Failed:', error instanceof Error ? error.message : 'Unknown error');
-    await showStatsAndExit(1);
+      await explorBot.stop();
+      await showStatsAndExit(0);
+    } catch (error) {
+      console.error('Failed:', error instanceof Error ? error.message : 'Unknown error');
+      await showStatsAndExit(1);
+    }
   }
-});
+);
 
 program
   .command('context <url>')
@@ -625,18 +683,18 @@ browserCmd
   });
 
 program
-  .command('extract-styles <agent>')
-  .description('Extract built-in planning styles to a directory for customization')
-  .option('-d, --dir <path>', 'Target directory (default: ./rules/<agent>/styles)')
+  .command('extract-rules <agent>')
+  .description('Extract built-in rules (including planning styles) for an agent to a directory for customization')
+  .option('-d, --dir <path>', 'Target directory (default: ./rules/<agent>)')
   .action(async (agent, options) => {
     try {
       const { RulesLoader } = await import('../src/utils/rules-loader.js');
-      const targetDir = options.dir || path.resolve(`./rules/${agent}/styles`);
-      const extracted = RulesLoader.extractStyles(agent, targetDir);
+      const targetDir = options.dir || path.resolve(`./rules/${agent}`);
+      const extracted = RulesLoader.extractRules(agent, targetDir);
       if (extracted.length === 0) {
-        console.log('All style files already exist in target directory.');
+        console.log('All rule files already exist in target directory.');
       } else {
-        console.log(`\nExtracted ${extracted.length} style files to ${targetDir}`);
+        console.log(`\nExtracted ${extracted.length} rule files to ${targetDir}`);
       }
     } catch (error) {
       console.error('Failed:', error instanceof Error ? error.message : 'Unknown error');
@@ -646,7 +704,6 @@ program
 
 program
   .command('add-rule [agent] [name]')
-  .alias('rules:add')
   .description('Create a rule file for an agent')
   .option('--url <pattern>', 'URL pattern for this rule')
   .option('-p, --path <path>', 'Working directory path')

package/dist/bin/explorbot-cli.js

@@ -1,7 +1,9 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
 import path from 'node:path';
+import chalk from 'chalk';
 import { Command } from 'commander';
+import figureSet from 'figures';
 import { render } from 'ink';
 import React from 'react';
 import { App } from '../src/components/App.js';
@@ -78,13 +80,13 @@ async function showStatsAndExit(code) {
     }
     process.exit(code);
 }
-addCommonOptions(program.command('start [path]').alias('sail').description('Start web exploration')).action(async (startPath, options) => {
+addCommonOptions(program.command('start [path]').description('Start web exploration')).action(async (startPath, options) => {
     setPreserveConsoleLogs(false);
     const explorBot = new ExplorBot(buildExplorBotOptions(startPath, options));
     await explorBot.start();
     await startTUI(explorBot);
 });
-addCommonOptions(program.command('explore <path>').description('Start web exploration (legacy command)').option('--max-tests <count>', 'Maximum number of tests to run')).action(async (explorePath, options) => {
+addCommonOptions(program.command('explore <path>').description('Explore a page autonomously and run invented scenarios').option('--max-tests <count>', 'Maximum number of tests to run')).action(async (explorePath, options) => {
     try {
         const explorBot = new ExplorBot(buildExplorBotOptions(explorePath, options));
         await explorBot.start();
@@ -128,15 +130,34 @@ addCommonOptions(program.command('plan <path>').description('Generate test plan
             await explorBot.stop();
             await showStatsAndExit(1);
         }
+        const suite = explorBot.getSuite();
+        if (suite && suite.automatedTestCount > 0) {
+            const names = suite.getAutomatedTestNames();
+            console.log(`\n${chalk.bold.cyan(`Already implemented (${names.length} tests)`)}`);
+            for (let i = 0; i < names.length; i++) {
+                console.log(`  ${chalk.dim(`${i + 1}.`)} ${chalk.green(figureSet.pointer)} ${names[i]}`);
+            }
+        }
+        if (plan?.tests.length) {
+            console.log(`\n${chalk.bold.cyan(`New test scenarios (${plan.tests.length})`)}`);
+            for (let i = 0; i < plan.tests.length; i++) {
+                const t = plan.tests[i];
+                console.log(`  ${chalk.dim(`${i + 1}.`)} ${chalk.green(figureSet.pointer)} ${t.scenario} ${chalk.dim(`[${t.priority}]`)}`);
+            }
+        }
         const savedPath = explorBot.savePlan();
         const planFile = savedPath ? path.basename(savedPath) : 'plan.md';
         const cliFlags = [options.path ? `--path ${options.path}` : '', options.session ? '--session' : ''].filter(Boolean).join(' ');
         const cliSuffix = cliFlags ? ` ${cliFlags}` : '';
         const lines = [];
-        lines.push('Run tests:');
-        lines.push(`\`${cli} test ${planFile} 1${cliSuffix}\` → run first test`);
-        lines.push(`\`${cli} test ${planFile} 1-3${cliSuffix}\` → run tests 1 to 3`);
-        lines.push(`\`${cli} test ${planFile} *${cliSuffix}\` → run all tests`);
+        lines.push('Run commands:');
+        lines.push(`\`${cli} test ${planFile} 1${cliSuffix}\` → run first new test`);
+        lines.push(`\`${cli} test ${planFile} *${cliSuffix}\` → run all new tests`);
+        if (suite && suite.automatedTestCount > 0) {
+            for (const f of suite.getAutomatedTestFiles()) {
+                lines.push(`\`${cli} rerun ${path.relative(process.cwd(), f)}${cliSuffix}\` → re-run automated tests`);
+            }
+        }
         log(parseMarkdownToTerminal(lines.join('\n')));
         await explorBot.stop();
         await showStatsAndExit(0);
@@ -240,6 +261,42 @@ addCommonOptions(program.command('test <planfile> [index]').description('Execute
         await showStatsAndExit(1);
     }
 });
+program
+    .command('runs [file]')
+    .description('List generated test files, or show steps for a specific file')
+    .option('-p, --path <path>', 'Working directory path')
+    .option('-c, --config <path>', 'Path to configuration file')
+    .action(async (file, options) => {
+    try {
+        await ConfigParser.getInstance().loadConfig({
+            config: options.config,
+            path: options.path || process.cwd(),
+        });
+        const explorBot = new ExplorBot({ path: options.path });
+        const { RunsCommand } = await import('../src/commands/runs-command.js');
+        await new RunsCommand(explorBot).execute(file || '');
+    }
+    catch (error) {
+        console.error('Failed:', error instanceof Error ? error.message : 'Unknown error');
+        process.exit(1);
+    }
+});
+addCommonOptions(program.command('rerun <filename> [index]').description('Re-run generated tests with AI auto-healing')).action(async (filename, index, options) => {
+    try {
+        const explorBot = new ExplorBot(buildExplorBotOptions(undefined, options));
+        await explorBot.start();
+        const { RerunCommand } = await import('../src/commands/rerun-command.js');
+        const cmd = new RerunCommand(explorBot);
+        const args = index ? `${filename} ${index}` : filename;
+        await cmd.execute(args);
+        await explorBot.stop();
+        await showStatsAndExit(0);
+    }
+    catch (error) {
+        console.error('Failed:', error instanceof Error ? error.message : 'Unknown error');
+        await showStatsAndExit(1);
+    }
+});
 addCommonOptions(program
     .command('freesail [startUrl]')
     .description('Continuously explore and navigate to new pages autonomously')
@@ -328,7 +385,6 @@ program
 });
 program
     .command('learn [url] [description]')
-    .alias('add-knowledge')
     .description('Add knowledge for URLs')
     .option('-p, --path <path>', 'Working directory path')
     .action(async (url, description, options) => {
@@ -395,7 +451,7 @@ addCommonOptions(program.command('research <url>').description('Research a page
         await showStatsAndExit(1);
     }
 });
-addCommonOptions(program.command('drill <url>').alias('bosun').description('Drill all components on a page to learn interactions').option('--knowledge <path>', 'Save learned interactions to knowledge file at this URL path').option('--max <count>', 'Maximum number of components to drill', '20')).action(async (url, options) => {
+addCommonOptions(program.command('drill <url>').description('Drill all components on a page to learn interactions').option('--knowledge <path>', 'Save learned interactions to knowledge file at this URL path').option('--max <count>', 'Maximum number of components to drill', '20')).action(async (url, options) => {
     try {
         const explorBot = new ExplorBot(buildExplorBotOptions(url, options));
         await explorBot.start();
@@ -555,19 +611,19 @@ browserCmd
     }
 });
 program
-    .command('extract-styles <agent>')
-    .description('Extract built-in planning styles to a directory for customization')
-    .option('-d, --dir <path>', 'Target directory (default: ./rules/<agent>/styles)')
+    .command('extract-rules <agent>')
+    .description('Extract built-in rules (including planning styles) for an agent to a directory for customization')
+    .option('-d, --dir <path>', 'Target directory (default: ./rules/<agent>)')
     .action(async (agent, options) => {
     try {
         const { RulesLoader } = await import('../src/utils/rules-loader.js');
-        const targetDir = options.dir || path.resolve(`./rules/${agent}/styles`);
-        const extracted = RulesLoader.extractStyles(agent, targetDir);
+        const targetDir = options.dir || path.resolve(`./rules/${agent}`);
+        const extracted = RulesLoader.extractRules(agent, targetDir);
         if (extracted.length === 0) {
-            console.log('All style files already exist in target directory.');
+            console.log('All rule files already exist in target directory.');
         }
         else {
-            console.log(`\nExtracted ${extracted.length} style files to ${targetDir}`);
+            console.log(`\nExtracted ${extracted.length} rule files to ${targetDir}`);
         }
     }
     catch (error) {
@@ -577,7 +633,6 @@ program
 });
 program
     .command('add-rule [agent] [name]')
-    .alias('rules:add')
     .description('Create a rule file for an agent')
     .option('--url <pattern>', 'URL pattern for this rule')
     .option('-p, --path <path>', 'Working directory path')

package/dist/rules/rerunner/healing-approach.md

@@ -0,0 +1,19 @@
+<healing_approach>
+The failed step was NOT performed. You MUST execute a replacement action.
+Just waiting or diagnosing is NOT enough — you must perform the click/fill/press that was intended.
+
+1. FIRST: Check the page URL and ARIA — are you on the right page?
+   - If URL or ARIA shows login/error/404 page → call giveUp immediately
+2. If ARIA is empty/minimal → page may still be loading:
+   - Use xpathCheck() to detect spinners, loaders, or loading indicators on the page
+   - Use wait() to let the page load — it returns fresh ARIA automatically
+   - Then execute the replacement action with a working locator
+3. If the target element is visible in ARIA:
+   - Use click() with multiple fallback locators (ARIA, CSS, XPath)
+4. If element is NOT in ARIA but page is correct:
+   - Use xpathCheck() to search the full HTML
+   - Use research() to get a semantic UI map of the page if needed
+   - If found → click it
+   - If not → bash to check console logs → giveUp
+5. Call done() with the command that replaced the failed step
+</healing_approach>

package/dist/src/action.js

@@ -50,7 +50,7 @@ class Action {
             return undefined;
         }
     }
-    async capturePageState({ includeScreenshot = false, ariaSnapshot: preCapuredAria } = {}) {
+    async capturePageState({ includeScreenshot = false } = {}) {
         try {
             const currentState = this.stateManager.getCurrentState();
             const stateHash = currentState?.hash || 'screenshot';
@@ -90,16 +90,14 @@ class Action {
             debugLog('Page:', { url, title, size: html.length, html: html.substring(0, 100) });
             // Capture iframe HTML snapshots
             const iframeSnapshots = await this.captureIframeSnapshots(html);
-            let ariaSnapshot = preCapuredAria || null;
+            let ariaSnapshot = null;
             let ariaSnapshotFile = undefined;
-            if (!ariaSnapshot) {
-                try {
-                    const page = this.playwrightHelper.page;
-                    ariaSnapshot = await page.locator('body').ariaSnapshot();
-                }
-                catch (err) {
-                    debugLog('ARIA snapshot failed:', err instanceof Error ? `${err.message}\n${err.stack}` : err);
-                }
+            try {
+                const page = this.playwrightHelper.page;
+                ariaSnapshot = await page.locator('body').ariaSnapshot();
+            }
+            catch (err) {
+                debugLog('ARIA snapshot failed:', err instanceof Error ? `${err.message}\n${err.stack}` : err);
             }
             if (ariaSnapshot) {
                 const ariaFileName = `${stateHash}_${timestamp}.aria.yaml`;

package/dist/src/ai/historian.js

@@ -1,9 +1,10 @@
-import { mkdirSync, writeFileSync } from 'node:fs';
+import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import dedent from 'dedent';
 import { z } from 'zod';
 import { ActionResult } from "../action-result.js";
 import { ConfigParser } from "../config.js";
+import { KnowledgeTracker } from "../knowledge-tracker.js";
 import { ExperienceTracker } from "../experience-tracker.js";
 import { Test } from "../test-plan.js";
 import { createDebug, tag } from "../utils/logger.js";
@@ -329,6 +330,7 @@ export class Historian {
         if (startUrl) {
             lines.push('Before(({ I }) => {');
             lines.push(`  I.amOnPage('${this.escapeString(startUrl)}');`);
+            lines.push(...this.getKnowledgeLines(startUrl));
             lines.push('});');
             lines.push('');
         }
@@ -356,8 +358,7 @@ export class Historian {
             lines.push('});');
             lines.push('');
         }
-        const outputDir = ConfigParser.getInstance().getOutputDir();
-        const testsDir = join(outputDir, 'tests');
+        const testsDir = ConfigParser.getInstance().getTestsDir();
         mkdirSync(testsDir, { recursive: true });
         const filename = plan.title.replace(/[^a-zA-Z0-9]/g, '_').toLowerCase();
         const filePath = join(testsDir, `${filename}.js`);
@@ -365,12 +366,42 @@ export class Historian {
         tag('substep').log(`Saved plan tests to: ${filePath}`);
         return filePath;
     }
+    rewriteScenarioInFile(filePath, healedSteps) {
+        let content = readFileSync(filePath, 'utf-8');
+        for (const step of healedSteps) {
+            if (!content.includes(step.original))
+                continue;
+            content = content.replace(step.original, step.healed);
+        }
+        writeFileSync(filePath, content);
+        tag('substep').log(`Updated test file with healed steps: ${filePath}`);
+    }
     getExecutionLabel(exec, fallback) {
         return exec.input?.explanation || exec.input?.assertion || exec.input?.note || fallback || '';
     }
     escapeString(str) {
         return str.replace(/'/g, "\\'").replace(/\n/g, ' ');
     }
+    getKnowledgeLines(url, indent = '  ') {
+        const knowledgeTracker = new KnowledgeTracker();
+        const state = new ActionResult({ url });
+        const { wait, waitForElement, code } = knowledgeTracker.getStateParameters(state, ['wait', 'waitForElement', 'code']);
+        const lines = [];
+        if (wait !== undefined) {
+            lines.push(`${indent}I.wait(${wait});`);
+        }
+        if (waitForElement) {
+            lines.push(`${indent}I.waitForElement(${JSON.stringify(waitForElement)});`);
+        }
+        if (code) {
+            for (const codeLine of code.split('\n')) {
+                const trimmed = codeLine.trim();
+                if (trimmed)
+                    lines.push(`${indent}${trimmed}`);
+            }
+        }
+        return lines;
+    }
     stripComments(code) {
         return code
             .split('\n')

package/dist/src/ai/navigator.js

@@ -31,6 +31,18 @@ class Navigator {
     You are given the web page and a message from user.
     You need to resolve the state of the page based on the message.
   </task>
+
+  ${locatorRule}
+
+  <constraints>
+    NEVER navigate away from the base URL domain. Stay on the same origin at all times.
+    NEVER attempt to rewrite, replace, mock, or spoof the URL via JavaScript, history API, location assignment, or any client-side trick.
+    NEVER use executeScript, executeAsyncScript, or any JS evaluation to change the URL, bypass redirects, or fake the page state.
+    If the target URL redirects to an authentication/login page, DO NOT try to force the original URL. Instead:
+      1. Look for credentials in the provided knowledge/hint context and perform a real login through the form.
+      2. If no credentials are available, ask the user for credentials or ask the user to log in manually.
+    A redirect to /login, /sign_in, /auth, or similar is a signal that authentication is required — treat it as such, never as an obstacle to bypass.
+  </constraints>
   `;
     freeSailSystemPrompt = dedent `
   <role>
@@ -145,6 +157,14 @@ class Navigator {
         ${message}
       </message>
 
+      <page>
+        ${actionResult.toAiContext()}
+
+        <page_html>
+        ${await actionResult.combinedHtml()}
+        </page_html>
+      </page>
+
       <task>
         Identify the actual request of the user.
         Identify what is expected by user.
@@ -155,25 +175,13 @@ class Navigator {
         Try various ways to achieve the result
       </task>
 
-
-      <page>
-        ${actionResult.toAiContext()}
-
-        <page_html>
-        ${await actionResult.simplifiedHtml()}
-        </page_html>
-      </page>
-
-
-      ${knowledge}
-
       ${actionRule}
 
-      ${experience}
+      ${RulesLoader.loadRules('navigator', ['multiple-locator', 'output'], actionResult.url || '').replace('{{maxAttempts}}', String(this.MAX_ATTEMPTS))}
 
-      ${locatorRule}
+      ${experience}
 
-      ${RulesLoader.loadRules('navigator', ['multiple-locator', 'output'], actionResult.url || '').replace('{{maxAttempts}}', String(this.MAX_ATTEMPTS))}
+      ${knowledge}
     `;
         const conversation = this.provider.startConversation(this.systemPrompt, 'navigator');
         conversation.addUserText(prompt);
@@ -206,7 +214,7 @@ class Navigator {
               Previous solutions did not work. Here is the full HTML context:
 
               <page_html>
-              ${await actionResult.simplifiedHtml()}
+              ${await actionResult.combinedHtml()}
               </page_html>
 
               Please suggest new solutions based on this additional context.
@@ -234,6 +242,7 @@ class Navigator {
             }
             if (resolved) {
                 tag('success').log('Navigation resolved successfully');
+                await this.experienceTracker.saveSuccessfulResolution(actionResult, message, codeBlock);
                 stop();
                 return;
             }
@@ -414,6 +423,14 @@ class Navigator {
         ${message}
       </message>
 
+      <page>
+        ${actionResult.toAiContext()}
+
+        <page_html>
+        ${await actionResult.combinedHtml()}
+        </page_html>
+      </page>
+
       <task>
         Identify what assertion the user wants to verify on the page.
         Propose different CodeceptJS assertion code blocks to verify the expected state.
@@ -427,21 +444,11 @@ class Navigator {
         Do not generate assertions that would pass even if the specific claim is false.
       </task>
 
-      <page>
-        ${actionResult.toAiContext()}
-
-        <page_html>
-        ${await actionResult.simplifiedHtml()}
-        </page_html>
-      </page>
-
-      ${knowledge}
-
       ${RulesLoader.loadRules('navigator', ['verification-actions'], actionResult.url || '')}
 
-      ${locatorRule}
-
       ${experience}
+
+      ${knowledge}
     `;
         debugLog('Sending verification prompt to AI provider');
         tag('debug').log('Prompt:', prompt);