explorbot 0.1.9 → 0.1.11

package/README.md

@@ -169,10 +169,36 @@ See [docs/commands.md](docs/commands.md) for all commands.
 
 | Output | Location | Description |
 |--------|----------|-------------|
-| Test files | `output/tests/*.js` | CodeceptJS tests you can run independently |
+| Test files | `output/tests/*.spec.ts` or `*.js` | Runnable Playwright or CodeceptJS tests |
 | Test plans | `output/plans/*.md` | Markdown documentation of scenarios |
 | Experience | `./experience/` | What Explorbot learned about your app |
 
+Every run is saved as a real Playwright or CodeceptJS test you can commit and run from CI. Choose the framework in your config:
+
+```js
+ai: { agents: { historian: { framework: 'playwright' } } }  // or 'codeceptjs' (default)
+```
+
+Playwright output uses the actual `page.locator(...)` calls executed during the run, with each action wrapped in `test.step` so failures land on a labelled step:
+
+```ts
+test('Create a new manual plan', async ({ page }) => {
+  await test.step("Click the 'New plan' button in toolbar", async () => {
+    await page.getByRole('button', { name: 'New plan' }).first().click();
+  });
+
+  await test.step('Select Manual plan type in modal', async () => {
+    await page.locator('#portal-container').getByRole('button', { name: 'Manual' }).click();
+  });
+
+  await test.step('Verification', async () => {
+    await expect(page).toContainText('Test Plan UI Creation 001');
+  });
+});
+```
+
+See [Automated Tests](docs/automated-tests.md) for the CodeceptJS version and how failed or unfinished scenarios are handled.
+
 ## Two Ways to Run
 
 **Interactive mode** — Launch TUI, guide exploration, get real-time feedback:

package/bin/explorbot-cli.ts

@@ -17,6 +17,7 @@ import { getCliName } from '../src/utils/cli-name.ts';
 import { log, setPreserveConsoleLogs } from '../src/utils/logger.js';
 import { jsonToTable } from '../src/utils/markdown-parser.js';
 import { parseMarkdownToTerminal } from '../src/utils/markdown-terminal.js';
+import { type NextStepSection, printNextSteps, relativeToCwd } from '../src/utils/next-steps.ts';
 
 const program = new Command();
 const cli = getCliName();
@@ -25,9 +26,10 @@ const pkgPath = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../p
 const pkgVersion = JSON.parse(fs.readFileSync(pkgPath, 'utf-8')).version as string;
 
 program.name(cli).description('AI-powered web exploration tool').version(pkgVersion, '-V, --version');
-program.hook('preAction', () => {
-  console.log(chalk.dim(`${cli} v${pkgVersion}`));
-});
+
+if (!process.env.EXPLORBOT_NO_BANNER) {
+  console.log(`⛵ ${chalk.yellow.bold(`Explorbot v${pkgVersion}`)} ${chalk.dim('Autonomous Testing Agent')}`);
+}
 
 interface CLIOptions {
   verbose?: boolean;
@@ -188,22 +190,32 @@ addCommonOptions(program.command('plan <path>').description('Generate test plan
       }
 
       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: string[] = [];
-      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`);
-        }
+      const sections: NextStepSection[] = [];
+      if (savedPath) {
+        const relPlan = relativeToCwd(savedPath);
+        sections.push({
+          label: 'Plan',
+          path: savedPath,
+          commands: [
+            { label: 'Re-run', command: `${cli} test ${relPlan} 1${cliSuffix}` },
+            { label: 'Run all', command: `${cli} test ${relPlan} *${cliSuffix}` },
+            { label: 'Run range', command: `${cli} test ${relPlan} 1-3${cliSuffix}` },
+          ],
+        });
       }
-
-      log(parseMarkdownToTerminal(lines.join('\n')));
+      const automatedFiles = suite && suite.automatedTestCount > 0 ? suite.getAutomatedTestFiles() : [];
+      if (automatedFiles.length > 0) {
+        const commands = automatedFiles.map((f) => ({ label: '', command: `${cli} rerun ${relativeToCwd(f)}${cliSuffix}` }));
+        sections.push({
+          label: `Automated tests (${automatedFiles.length})`,
+          commands,
+        });
+      }
+      printNextSteps(sections);
 
       await explorBot.stop();
       await showStatsAndExit(0);
@@ -383,7 +395,7 @@ program
 
 program
   .command('clean [target]')
-  .description('Clean files: states, research, plans, experiences, output (default: output + experiences)')
+  .description('Clean files: states, research, plans, tests, experiences, output (default: output + experiences)')
   .option('-p, --path <path>', 'Custom path to clean')
   .action(async (target, options) => {
     const customPath = options.path;
@@ -394,6 +406,7 @@ program
       states: { description: 'page states', dir: path.join(basePath, 'output', 'states') },
       research: { description: 'research cache', dir: path.join(basePath, 'output', 'research') },
       plans: { description: 'test plans', dir: path.join(basePath, 'output', 'plans') },
+      tests: { description: 'generated tests', dir: path.join(basePath, 'output', 'tests') },
       experiences: { description: 'experience files', dir: path.join(basePath, 'experience') },
       output: { description: 'all output files', dir: path.join(basePath, 'output') },
     };
@@ -492,6 +505,64 @@ program
     }
   });
 
+program
+  .command('compact [target]')
+  .description('Compact stored experience files; pass filename or URL substring to limit scope')
+  .option('--dry-run', 'Preview without running AI or writing files')
+  .option('--no-merge', 'Skip the cross-URL merge step when compacting all')
+  .option('-p, --path <path>', 'Working directory path')
+  .option('-c, --config <path>', 'Path to configuration file')
+  .option('-v, --verbose', 'Enable verbose logging')
+  .action(async (target, options) => {
+    try {
+      const explorBot = new ExplorBot({
+        path: options.path,
+        config: options.config,
+        verbose: options.verbose,
+      });
+      await explorBot.startProviderOnly();
+
+      const { CompactCommand } = await import('../src/commands/compact-command.js');
+      const argParts = [target, options.dryRun && '--dry-run', options.merge === false && '--no-merge'].filter(Boolean).join(' ');
+      const command = new CompactCommand(explorBot);
+      await command.execute(argParts);
+      command.printSuggestions();
+
+      await showStatsAndExit(0);
+    } catch (error) {
+      console.error('Failed:', error instanceof Error ? error.message : 'Unknown error');
+      await showStatsAndExit(1);
+    }
+  });
+
+program
+  .command('experience [filter] [index]')
+  .description('List stored experiences grouped by URL; pass URL substring to filter; pass tag (A.1) or index to expand a section')
+  .option('-p, --path <path>', 'Working directory path')
+  .option('-c, --config <path>', 'Path to configuration file')
+  .option('--recent', 'Only files modified within the last 30 days')
+  .option('--old', 'Only files modified more than 30 days ago')
+  .action(async (filter, index, options) => {
+    try {
+      await ConfigParser.getInstance().loadConfig({
+        config: options.config,
+        path: options.path || process.cwd(),
+      });
+      const { ExperienceCommand } = await import('../src/commands/experience-command.js');
+      const explorBot = new ExplorBot({ path: options.path });
+      const command = new ExperienceCommand(explorBot);
+      const flags: string[] = [];
+      if (options.recent) flags.push('--recent');
+      if (options.old) flags.push('--old');
+      const args = [...flags, filter, index].filter(Boolean).join(' ');
+      await command.execute(args);
+      command.printSuggestions();
+    } catch (error) {
+      console.error('Failed:', error instanceof Error ? error.message : 'Unknown error');
+      process.exit(1);
+    }
+  });
+
 addCommonOptions(program.command('research <url>').description('Research a page and print UI analysis').option('--data', 'Include data extraction in research').option('--deep', 'Enable deep analysis (expand hidden elements)').option('--no-fix', 'Skip locator fix cycle (for debugging)')).action(
   async (url, options) => {
     try {

package/boat/api-tester/src/ai/curler-tools.ts

@@ -1,13 +1,13 @@
-import { tool } from 'ai';
-import { expect } from 'expect';
 import { readFileSync } from 'node:fs';
+import { tool } from 'ai';
 import dedent from 'dedent';
+import { expect } from 'expect';
 import { z } from 'zod';
+import type { RequestStore } from '../../../../src/api/request-store.ts';
 import type { Test, TestResultType } from '../../../../src/test-plan.ts';
 import { TestResult } from '../../../../src/test-plan.ts';
 import { tag } from '../../../../src/utils/logger.ts';
 import type { ApiClient } from '../api-client.ts';
-import type { RequestStore } from '../../../../src/api/request-store.ts';
 
 const readResponseData = (responseFile: string) => {
   return JSON.parse(readFileSync(responseFile, 'utf8'));

package/boat/api-tester/src/ai/curler.ts

@@ -1,12 +1,12 @@
 import dedent from 'dedent';
 import { z } from 'zod';
 import type { AIProvider } from '../../../../src/ai/provider.ts';
+import type { RequestStore } from '../../../../src/api/request-store.ts';
 import type { Reporter } from '../../../../src/reporter.ts';
 import { type Test, TestResult } from '../../../../src/test-plan.ts';
 import { createDebug, tag } from '../../../../src/utils/logger.ts';
 import { loop } from '../../../../src/utils/loop.ts';
 import type { ApiClient } from '../api-client.ts';
-import type { RequestStore } from '../../../../src/api/request-store.ts';
 import { createCurlerTools } from './curler-tools.ts';
 
 const debugLog = createDebug('explorbot:curler');

package/boat/api-tester/src/apibot.ts

@@ -1,6 +1,8 @@
 import { existsSync, mkdirSync } from 'node:fs';
 import path from 'node:path';
 import { AIProvider } from '../../../src/ai/provider.ts';
+import { RequestStore } from '../../../src/api/request-store.ts';
+import { extractEndpointDefinition, loadSpec, searchEndpoints, validateSpecs } from '../../../src/api/spec-reader.ts';
 import { Reporter } from '../../../src/reporter.ts';
 import { Plan } from '../../../src/test-plan.ts';
 import { setVerboseMode, tag } from '../../../src/utils/logger.ts';
@@ -8,8 +10,6 @@ import { Chief } from './ai/chief.ts';
 import { Curler } from './ai/curler.ts';
 import { ApiClient } from './api-client.ts';
 import { type ApibotConfig, ApibotConfigParser } from './config.ts';
-import { RequestStore } from '../../../src/api/request-store.ts';
-import { extractEndpointDefinition, loadSpec, searchEndpoints, validateSpecs } from '../../../src/api/spec-reader.ts';
 
 export class ApiBot {
   private configParser: ApibotConfigParser;

package/boat/api-tester/src/config.ts

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, readFileSync } from 'node:fs';
 import path, { resolve } from 'node:path';
 import { parseEnv } from 'node:util';
-import { EXPLORBOT_CONFIG_PATHS, type AIConfig, type ApiConfig as BaseApiConfig, type ApiHookFn } from '../../../src/config.ts';
+import { type AIConfig, type ApiHookFn, type ApiConfig as BaseApiConfig, EXPLORBOT_CONFIG_PATHS } from '../../../src/config.ts';
 
 export type { AIConfig };
 

package/dist/bin/explorbot-cli.js

@@ -17,14 +17,15 @@ import { getCliName } from "../src/utils/cli-name.js";
 import { log, setPreserveConsoleLogs } from '../src/utils/logger.js';
 import { jsonToTable } from '../src/utils/markdown-parser.js';
 import { parseMarkdownToTerminal } from '../src/utils/markdown-terminal.js';
+import { printNextSteps, relativeToCwd } from "../src/utils/next-steps.js";
 const program = new Command();
 const cli = getCliName();
 const pkgPath = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../package.json');
 const pkgVersion = JSON.parse(fs.readFileSync(pkgPath, 'utf-8')).version;
 program.name(cli).description('AI-powered web exploration tool').version(pkgVersion, '-V, --version');
-program.hook('preAction', () => {
-    console.log(chalk.dim(`${cli} v${pkgVersion}`));
-});
+if (!process.env.EXPLORBOT_NO_BANNER) {
+    console.log(`⛵ ${chalk.yellow.bold(`Explorbot v${pkgVersion}`)} ${chalk.dim('Autonomous Testing Agent')}`);
+}
 function buildExplorBotOptions(from, options) {
     return {
         from,
@@ -155,19 +156,30 @@ addCommonOptions(program.command('plan <path>').description('Generate test plan
             }
         }
         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 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`);
-            }
+        const sections = [];
+        if (savedPath) {
+            const relPlan = relativeToCwd(savedPath);
+            sections.push({
+                label: 'Plan',
+                path: savedPath,
+                commands: [
+                    { label: 'Re-run', command: `${cli} test ${relPlan} 1${cliSuffix}` },
+                    { label: 'Run all', command: `${cli} test ${relPlan} *${cliSuffix}` },
+                    { label: 'Run range', command: `${cli} test ${relPlan} 1-3${cliSuffix}` },
+                ],
+            });
         }
-        log(parseMarkdownToTerminal(lines.join('\n')));
+        const automatedFiles = suite && suite.automatedTestCount > 0 ? suite.getAutomatedTestFiles() : [];
+        if (automatedFiles.length > 0) {
+            const commands = automatedFiles.map((f) => ({ label: '', command: `${cli} rerun ${relativeToCwd(f)}${cliSuffix}` }));
+            sections.push({
+                label: `Automated tests (${automatedFiles.length})`,
+                commands,
+            });
+        }
+        printNextSteps(sections);
         await explorBot.stop();
         await showStatsAndExit(0);
     }
@@ -336,7 +348,7 @@ program
 });
 program
     .command('clean [target]')
-    .description('Clean files: states, research, plans, experiences, output (default: output + experiences)')
+    .description('Clean files: states, research, plans, tests, experiences, output (default: output + experiences)')
     .option('-p, --path <path>', 'Custom path to clean')
     .action(async (target, options) => {
     const customPath = options.path;
@@ -346,6 +358,7 @@ program
         states: { description: 'page states', dir: path.join(basePath, 'output', 'states') },
         research: { description: 'research cache', dir: path.join(basePath, 'output', 'research') },
         plans: { description: 'test plans', dir: path.join(basePath, 'output', 'plans') },
+        tests: { description: 'generated tests', dir: path.join(basePath, 'output', 'tests') },
         experiences: { description: 'experience files', dir: path.join(basePath, 'experience') },
         output: { description: 'all output files', dir: path.join(basePath, 'output') },
     };
@@ -439,6 +452,64 @@ program
         process.exit(1);
     }
 });
+program
+    .command('compact [target]')
+    .description('Compact stored experience files; pass filename or URL substring to limit scope')
+    .option('--dry-run', 'Preview without running AI or writing files')
+    .option('--no-merge', 'Skip the cross-URL merge step when compacting all')
+    .option('-p, --path <path>', 'Working directory path')
+    .option('-c, --config <path>', 'Path to configuration file')
+    .option('-v, --verbose', 'Enable verbose logging')
+    .action(async (target, options) => {
+    try {
+        const explorBot = new ExplorBot({
+            path: options.path,
+            config: options.config,
+            verbose: options.verbose,
+        });
+        await explorBot.startProviderOnly();
+        const { CompactCommand } = await import('../src/commands/compact-command.js');
+        const argParts = [target, options.dryRun && '--dry-run', options.merge === false && '--no-merge'].filter(Boolean).join(' ');
+        const command = new CompactCommand(explorBot);
+        await command.execute(argParts);
+        command.printSuggestions();
+        await showStatsAndExit(0);
+    }
+    catch (error) {
+        console.error('Failed:', error instanceof Error ? error.message : 'Unknown error');
+        await showStatsAndExit(1);
+    }
+});
+program
+    .command('experience [filter] [index]')
+    .description('List stored experiences grouped by URL; pass URL substring to filter; pass tag (A.1) or index to expand a section')
+    .option('-p, --path <path>', 'Working directory path')
+    .option('-c, --config <path>', 'Path to configuration file')
+    .option('--recent', 'Only files modified within the last 30 days')
+    .option('--old', 'Only files modified more than 30 days ago')
+    .action(async (filter, index, options) => {
+    try {
+        await ConfigParser.getInstance().loadConfig({
+            config: options.config,
+            path: options.path || process.cwd(),
+        });
+        const { ExperienceCommand } = await import('../src/commands/experience-command.js');
+        const explorBot = new ExplorBot({ path: options.path });
+        const command = new ExperienceCommand(explorBot);
+        const flags = [];
+        if (options.recent)
+            flags.push('--recent');
+        if (options.old)
+            flags.push('--old');
+        const args = [...flags, filter, index].filter(Boolean).join(' ');
+        await command.execute(args);
+        command.printSuggestions();
+    }
+    catch (error) {
+        console.error('Failed:', error instanceof Error ? error.message : 'Unknown error');
+        process.exit(1);
+    }
+});
 addCommonOptions(program.command('research <url>').description('Research a page and print UI analysis').option('--data', 'Include data extraction in research').option('--deep', 'Enable deep analysis (expand hidden elements)').option('--no-fix', 'Skip locator fix cycle (for debugging)')).action(async (url, options) => {
     try {
         const explorBot = new ExplorBot(buildExplorBotOptions(url, options));

package/dist/boat/api-tester/src/ai/curler-tools.js

@@ -1,7 +1,7 @@
-import { tool } from 'ai';
-import { expect } from 'expect';
 import { readFileSync } from 'node:fs';
+import { tool } from 'ai';
 import dedent from 'dedent';
+import { expect } from 'expect';
 import { z } from 'zod';
 import { TestResult } from "../../../../src/test-plan.js";
 import { tag } from "../../../../src/utils/logger.js";

package/dist/boat/api-tester/src/apibot.js

@@ -1,6 +1,8 @@
 import { existsSync, mkdirSync } from 'node:fs';
 import path from 'node:path';
 import { AIProvider } from "../../../src/ai/provider.js";
+import { RequestStore } from "../../../src/api/request-store.js";
+import { extractEndpointDefinition, loadSpec, searchEndpoints, validateSpecs } from "../../../src/api/spec-reader.js";
 import { Reporter } from "../../../src/reporter.js";
 import { Plan } from "../../../src/test-plan.js";
 import { setVerboseMode, tag } from "../../../src/utils/logger.js";
@@ -8,8 +10,6 @@ import { Chief } from "./ai/chief.js";
 import { Curler } from "./ai/curler.js";
 import { ApiClient } from "./api-client.js";
 import { ApibotConfigParser } from "./config.js";
-import { RequestStore } from "../../../src/api/request-store.js";
-import { extractEndpointDefinition, loadSpec, searchEndpoints, validateSpecs } from "../../../src/api/spec-reader.js";
 export class ApiBot {
     configParser;
     provider;

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "explorbot",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "CLI app built with React Ink, CodeceptJS, and Playwright",
   "license": "Elastic-2.0",
   "type": "module",
@@ -83,7 +83,7 @@
     "axe-core": "^4.11.1",
     "bash-tool": "^1.3.15",
     "cli-highlight": "^2.1.11",
-    "codeceptjs": "4.0.0-rc.11",
+    "codeceptjs": "4.0.0-rc.16",
     "commander": "^14.0.1",
     "debug": "^4.4.3",
     "dedent": "^1.6.0",

package/dist/rules/navigator/output.md

@@ -13,6 +13,10 @@ In <explanation> write only one line without heading or bullet list or any other
 Check previous solutions, if there is already successful solution, use it!
 CodeceptJS code must start with "I."
 All lines of code must be CodeceptJS code and start with "I."
+
+Do not mix form filling with navigation in the same code block.
+If the code block fills a form and clicks a submit/confirm control, stop there — do not append I.amOnPage afterwards. Submitting the form already triggers navigation on the server side, and a follow-up I.amOnPage cancels that in-flight navigation and discards the just-submitted state (session, cookies, redirect target).
+If the action does not cause navigation on its own and a separate page visit is required to reach the target, put I.amOnPage in its own code block as a distinct step, not glued onto the form submission block.
 </rules>
 
 <output>
@@ -42,6 +46,11 @@ Use only locators from HTML PAGE that was passed in <page> context.
 <example_output>
 Trying to fill the form on the page
 
+```js
+  I.fillField({ "role": "textbox", "text": "Name" }, 'Value');
+  I.click({ "role": "button", "text": "Submit" });
+```
+
 ```js
   I.fillField('Name', 'Value');
   I.click('Submit');

package/dist/rules/navigator/verification-actions.md

@@ -113,6 +113,8 @@ For input field values, ALWAYS use I.seeInField() — never check value via CSS
 Prefer text locators (label, name, placeholder) for form fields: I.seeInField('Search', 'value') over I.seeInField('input[name="search"]', 'value').
 Only use locators that exist in the provided HTML or ARIA snapshot.
 Verify exact conditions, not approximate matches.
+NEVER use `:has-text(...)` inside a seeElement/dontSeeElement locator. Checking text inside an element is the job of I.see(text, context) — the `:has-text()` form duplicates that capability with a fragile selector.
+NEVER emit two assertions that check the same fact with different shapes. `I.see(text, locator)` and `I.seeElement("<locator>:has-text('text')")` verify the same thing — pick one (prefer I.see). One claim, one assertion.
 </verification_rules>
 
 [DO NEVER USE OTHER CODECEPTJS COMMANDS THAN PROPOSED HERE]

package/dist/src/action-result.js

@@ -502,7 +502,7 @@ export class ActionResult {
                 }
             }
             if (processedParts.length > 0) {
-                pageDiff.htmlParts = processedParts;
+                pageDiff.htmlParts = collapseHtmlParts(processedParts);
             }
         }
         if (pageDiff.ariaChanges && this.iframeSnapshots.length > 0) {
@@ -517,6 +517,28 @@ export class ActionResult {
         return result;
     }
 }
+const HTML_PARTS_TOTAL_BUDGET = 8000;
+const HTML_PARTS_COUNT_LIMIT = 8;
+const HTML_PART_SUBTREE_BUDGET = 2000;
+function collapseHtmlParts(parts) {
+    const total = parts.reduce((sum, p) => sum + p.subtree.length, 0);
+    const fullPageReRender = total > HTML_PARTS_TOTAL_BUDGET || parts.length > HTML_PARTS_COUNT_LIMIT;
+    if (fullPageReRender) {
+        return parts.map((part) => ({
+            ...part,
+            subtree: `<html><head></head><body>...collapsed (${part.subtree.length} chars, ${part.added.length} added, ${part.removed.length} removed)...</body></html>`,
+        }));
+    }
+    return parts.map((part) => {
+        if (part.subtree.length <= HTML_PART_SUBTREE_BUDGET)
+            return part;
+        const head = part.subtree.slice(0, HTML_PART_SUBTREE_BUDGET);
+        return {
+            ...part,
+            subtree: `${head}...<!-- truncated ${part.subtree.length - HTML_PART_SUBTREE_BUDGET} chars -->`,
+        };
+    });
+}
 export class Diff {
     current;
     previous;

package/dist/src/action.js

@@ -24,11 +24,15 @@ class Action {
     expectation = null;
     lastError = null;
     playwrightHelper;
-    constructor(actor, stateManager) {
+    playwrightGroupId = null;
+    assertionSteps = [];
+    recorder;
+    constructor(actor, stateManager, recorder) {
         this.actor = actor;
         this.stateManager = stateManager;
         this.config = ConfigParser.getInstance().getConfig();
         this.playwrightHelper = container.helpers('Playwright');
+        this.recorder = recorder;
     }
     async caputrePageWithScreenshot() {
         return this.capturePageState({ includeScreenshot: true });
@@ -57,7 +61,15 @@ class Action {
             const timestamp = Date.now();
             const page = this.playwrightHelper.page;
             const frame = this.playwrightHelper.frame;
-            const [html, title, browserLogs] = await Promise.all([this.actor.grabSource(), this.actor.grabTitle(), this.captureBrowserLogs()]);
+            await page?.waitForLoadState('domcontentloaded', { timeout: 10000 })?.catch(() => { });
+            const grabAll = () => Promise.all([this.actor.grabSource(), this.actor.grabTitle(), this.captureBrowserLogs()]);
+            const [html, title, browserLogs] = await grabAll().catch(async (err) => {
+                const msg = err instanceof Error ? err.message : String(err);
+                if (!/navigating and changing the content/i.test(msg))
+                    throw err;
+                await page?.waitForLoadState('domcontentloaded', { timeout: 10000 })?.catch(() => { });
+                return grabAll();
+            });
             const url = page?.url() || (await this.actor.grabCurrentUrl?.());
             let screenshotFile = undefined;
             if (includeScreenshot) {
@@ -183,7 +195,10 @@ class Action {
         setActivity('🔎 Browsing...', 'action');
         let codeString = code.replace(/^\(I\) => /, '').trim();
         const executedSteps = [];
-        registerStepLogger(executedSteps);
+        const assertionSteps = [];
+        const stepListener = attachStepLogger(executedSteps, assertionSteps);
+        const groupId = this.recorder ? await this.recorder.beginAction(codeString) : null;
+        this.playwrightGroupId = groupId;
         const activeSpan = Observability.getSpan();
         const tracer = trace.getTracer('ai');
         const stepSpan = activeSpan ? tracer.startSpan('codeceptjs.step', undefined, trace.setSpan(context.active(), activeSpan)) : null;
@@ -213,6 +228,7 @@ class Action {
             }
             this.stateManager.updateState(pageState, codeString);
             this.actionResult = pageState;
+            this.assertionSteps = assertionSteps;
         }
         catch (err) {
             debugLog('Action error', errorToString(err));
@@ -221,10 +237,13 @@ class Action {
                 await recorder.reset();
                 await recorder.start();
             }
+            this.assertionSteps = [];
             throw err;
         }
         finally {
-            unregisterStepLogger();
+            if (groupId)
+                await this.recorder.endAction();
+            detachStepLogger(stepListener);
             if (stepSpan) {
                 stepSpan.end();
             }
@@ -350,39 +369,28 @@ function hasPlaywrightCommands(code) {
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
-let stepLoggerRegistered = false;
-let stepLoggerTarget = null;
-const stepLogger = (step, error) => {
-    if (!step?.toCode) {
-        return;
-    }
-    if (step.name?.startsWith('grab'))
-        return;
-    const stepCode = step.toCode();
-    if (stepLoggerTarget) {
-        stepLoggerTarget.push(stepCode);
-    }
-    if (error) {
-        tag('step').log(step, error);
-        return;
-    }
-    tag('step').log(step);
-};
-const registerStepLogger = (target) => {
-    stepLoggerTarget = target;
-    if (stepLoggerRegistered) {
-        return;
-    }
-    stepLoggerRegistered = true;
-    codeceptjs.event.dispatcher.on(codeceptjs.event.step.passed, stepLogger);
-    codeceptjs.event.dispatcher.on(codeceptjs.event.step.failed, stepLogger);
+const ASSERTION_STEP_NAMES = new Set(['see', 'dontSee', 'seeElement', 'dontSeeElement', 'seeInField', 'dontSeeInField', 'seeInCurrentUrl', 'dontSeeInCurrentUrl']);
+const attachStepLogger = (target, assertionsTarget) => {
+    const listener = (step, error) => {
+        if (!step?.toCode)
+            return;
+        if (step.name?.startsWith('grab'))
+            return;
+        target.push(step.toCode());
+        if (assertionsTarget && ASSERTION_STEP_NAMES.has(step.name)) {
+            assertionsTarget.push({ name: step.name, args: step.args || [] });
+        }
+        if (error) {
+            tag('step').log(step, error);
+            return;
+        }
+        tag('step').log(step);
+    };
+    codeceptjs.event.dispatcher.on(codeceptjs.event.step.passed, listener);
+    codeceptjs.event.dispatcher.on(codeceptjs.event.step.failed, listener);
+    return listener;
 };
-const unregisterStepLogger = () => {
-    stepLoggerTarget = null;
-    if (!stepLoggerRegistered) {
-        return;
-    }
-    stepLoggerRegistered = false;
-    codeceptjs.event.dispatcher.off(codeceptjs.event.step.passed, stepLogger);
-    codeceptjs.event.dispatcher.off(codeceptjs.event.step.failed, stepLogger);
+const detachStepLogger = (listener) => {
+    codeceptjs.event.dispatcher.off(codeceptjs.event.step.passed, listener);
+    codeceptjs.event.dispatcher.off(codeceptjs.event.step.failed, listener);
 };