@mablhq/mabl-cli 2.94.5 → 2.96.5

package/mablscript/importer.js

@@ -15,6 +15,7 @@ exports.getQueryIds = getQueryIds;
 exports.getSnippetIdsFromJsonFlow = getSnippetIdsFromJsonFlow;
 exports.getSnippetIdsFromMablscriptFlow = getSnippetIdsFromMablscriptFlow;
 exports.getSnippetIdsFromApiFlow = getSnippetIdsFromApiFlow;
+exports.getSnippetIdsFromFlow = getSnippetIdsFromFlow;
 exports.getSnippetIdsFromFlows = getSnippetIdsFromFlows;
 const esprima_1 = require("esprima");
 const estraverse_1 = require("estraverse");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mablhq/mabl-cli",
-  "version": "2.94.5",
+  "version": "2.96.5",
   "license": "SEE LICENSE IN LICENSE.txt",
   "description": "The official mabl command line interface tool",
   "main": "index.js",

package/trainer/cli/CliEventHandler.js

@@ -8,6 +8,7 @@ const mablApi_1 = require("../../mablApi");
 const generation_types_1 = require("../sharedUtils/generation-types");
 const mablscript_step_types_1 = require("../sharedUtils/mablscript-step-types");
 const ExecuteFlowStep_1 = __importDefault(require("../sharedUtils/mablscript/extended/ExecuteFlowStep"));
+const ExecuteStepGroupStep_1 = __importDefault(require("../sharedUtils/mablscript/extended/ExecuteStepGroupStep"));
 const importer_1 = require("../../mablscript/importer");
 const chalk = require('chalk');
 class CliEventHandler {
@@ -97,6 +98,44 @@ class CliEventHandler {
     completeTask() {
         console.log('Task completed');
     }
+    moveCursorIntoGroup() {
+        this.state.moveCursorIntoGroup();
+    }
+    moveCursorOutOfGroup() {
+        this.state.moveCursorOutOfGroup();
+    }
+    isInsideStepGroup() {
+        return this.state.isInsideStepGroup();
+    }
+    getNextStepIndex() {
+        return this.state.getNextStepIndex();
+    }
+    setNextStepIndex(index) {
+        this.state.setNextStepIndex(index);
+    }
+    getStepAtPath(path) {
+        if (path.length === 0) {
+            return undefined;
+        }
+        let currentSteps = this.state.getSteps();
+        let step;
+        for (let i = 0; i < path.length; i++) {
+            const index = path[i];
+            if (index < 0 || index >= currentSteps.length) {
+                return undefined;
+            }
+            step = currentSteps[index];
+            if (i < path.length - 1) {
+                if (step instanceof ExecuteStepGroupStep_1.default) {
+                    currentSteps = step.stepsInGroup;
+                }
+                else {
+                    return undefined;
+                }
+            }
+        }
+        return step;
+    }
     addAgentLogEntry(entry) {
         switch (entry.type) {
             case generation_types_1.AgentLogEntryType.ToolExecuted:
@@ -186,7 +225,7 @@ class CliEventHandler {
                 flowInvariantId: flow.invariant_id,
                 flow,
             });
-            this.state.addSteps([flowStep]);
+            await this.dispatchSteps([flowStep]);
         }
         try {
             const mablSteps = (0, importer_1.parseMablScriptIntoSteps)(flow);
@@ -229,7 +268,23 @@ class CliEventHandler {
         return Promise.resolve();
     }
     async dispatchSteps(steps, options) {
-        if (options?.index) {
+        const cursor = this.state.getNextStepIndex();
+        if (cursor.length > 1 && !options?.skipActiveGroupInsertion) {
+            const containerPath = cursor.slice(0, -1);
+            const stepGroup = this.getStepAtPath(containerPath);
+            if ((0, mablscript_step_types_1.isStepGroupStep)(stepGroup)) {
+                const insertIdx = cursor[cursor.length - 1];
+                stepGroup.stepsInGroup.splice(insertIdx, 0, ...steps);
+                this.state.setNextStepIndex([
+                    ...containerPath,
+                    insertIdx + steps.length,
+                ]);
+            }
+            else {
+                this.state.addSteps(steps);
+            }
+        }
+        else if (options?.index) {
             this.state.insertStepsAtCursor(steps);
         }
         else {
@@ -239,6 +294,12 @@ class CliEventHandler {
             console.log(`  ${options.description}`);
         }
         for (const step of steps) {
+            if ((0, mablscript_step_types_1.isStepGroupStep)(step) || (0, mablscript_step_types_1.isStepWithReusableFlow)(step)) {
+                if (this.verbose) {
+                    console.log(`  Step ${step.stepType}: container step, skipping execution`);
+                }
+                continue;
+            }
             this.resetReplayResponse();
             const result = await this.runSingleStep(step);
             if (this.verbose) {
@@ -251,6 +312,12 @@ class CliEventHandler {
                 level: result.level,
             });
         }
+        if (options?.skipActiveGroupInsertion && steps.length > 0) {
+            const lastStep = steps[steps.length - 1];
+            if ((0, mablscript_step_types_1.isStepGroupStep)(lastStep) && lastStep.stepsInGroup.length === 0) {
+                this.moveCursorIntoGroup();
+            }
+        }
     }
     syncVariablesFromExecutionContext() {
         const executionVars = this.stepExecutor.getVariables();

package/trainer/cli/CliStateProvider.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CliStateProvider = void 0;
 class CliStateProvider {
-    constructor(state, trainingContext, flowCache) {
+    constructor(state, trainingContext, flowCache, accountFeatures) {
         this.state = state;
         this.trainingContext = trainingContext;
         this.flowCache = flowCache;
+        this.accountFeatures = accountFeatures;
     }
     getTestGenerationStatus() {
         return this.state.getStatus();
@@ -121,5 +122,8 @@ class CliStateProvider {
     clearArtifacts() {
         this.state.clearArtifacts();
     }
+    hasStepGroupsFeature() {
+        return this.accountFeatures?.hasStepGroups() ?? false;
+    }
 }
 exports.CliStateProvider = CliStateProvider;

package/trainer/cli/CliTestGenerationState.js

@@ -104,6 +104,31 @@ class CliTestGenerationState {
     setActiveURL(url) {
         this.activeURL = url;
     }
+    moveCursorIntoGroup() {
+        const lastIndex = this.nextStepIndex[this.nextStepIndex.length - 1];
+        if (lastIndex > 0) {
+            this.nextStepIndex = [
+                ...this.nextStepIndex.slice(0, -1),
+                lastIndex - 1,
+                0,
+            ];
+        }
+        else {
+            this.nextStepIndex = [...this.nextStepIndex, 0];
+        }
+    }
+    moveCursorOutOfGroup() {
+        if (this.nextStepIndex.length > 1) {
+            const parentPath = this.nextStepIndex.slice(0, -1);
+            this.nextStepIndex = [
+                ...parentPath.slice(0, -1),
+                parentPath[parentPath.length - 1] + 1,
+            ];
+        }
+    }
+    isInsideStepGroup() {
+        return this.nextStepIndex.length > 1;
+    }
     getVariables() {
         return this.variables;
     }

package/trainer/cli/buildCliArtifacts.js

@@ -8,9 +8,9 @@ exports.buildTestInfoArtifact = buildTestInfoArtifact;
 exports.buildAllArtifacts = buildAllArtifacts;
 const variable_utils_1 = require("../sharedUtils/variable-utils");
 const humanize_1 = require("../sharedUtils/mablscript/humanize");
-const mablscript_step_types_1 = require("../sharedUtils/mablscript-step-types");
 const type_utils_1 = require("../sharedUtils/type-utils");
 const contextBuilder_1 = require("../sharedUtils/contextBuilder");
+const mablscript_step_types_1 = require("../sharedUtils/mablscript-step-types");
 const uuid_1 = require("uuid");
 function createJsonArtifact(id, name, description, value) {
     return {
@@ -24,18 +24,42 @@ function createJsonArtifact(id, name, description, value) {
         },
     };
 }
-function processStepsWithDescriptions(steps, variables, cursorIndex, state) {
+function processStepsWithDescriptions(steps, variables, cursorIndex, state, depth = 0) {
     const stepList = [];
     const tasks = [];
     let currentTaskIndex = -1;
     let cursorFound = false;
+    const cursorAtThisDepth = cursorIndex[depth];
+    const cursorIsAtThisDepth = cursorIndex.length === depth + 1;
     steps.forEach((step, index) => {
-        const isAtCursor = cursorIndex.length === 1 && cursorIndex[0] === index;
+        const isAtCursor = cursorIsAtThisDepth && cursorAtThisDepth === index;
         if (isAtCursor && !cursorFound) {
             cursorFound = true;
         }
-        const parsedTask = (0, contextBuilder_1.parseTaskFromEchoStep)(step);
-        if ((0, mablscript_step_types_1.isStepWithReusableFlow)(step) &&
+        if ((0, mablscript_step_types_1.isStepGroupStep)(step)) {
+            const groupDescription = step.description ?? 'Unnamed Step Group';
+            stepList.push(`Start task: ${groupDescription}`);
+            tasks.push(groupDescription);
+            const taskIsBeforeCursor = cursorAtThisDepth > index;
+            if (taskIsBeforeCursor) {
+                currentTaskIndex++;
+            }
+            const cursorIsInsideThisGroup = cursorIndex.length > depth + 1 && cursorAtThisDepth === index;
+            if (cursorIsInsideThisGroup) {
+                const nestedResult = processStepsWithDescriptions(step.stepsInGroup, variables, cursorIndex, state, depth + 1);
+                stepList.push(...nestedResult.stepList);
+                if (nestedResult.cursorFound) {
+                    cursorFound = true;
+                }
+            }
+            else {
+                step.stepsInGroup.forEach((nestedStep) => {
+                    stepList.push((0, humanize_1.humanizeStepDescription)(nestedStep, variables));
+                });
+            }
+            stepList.push(`End task: ${groupDescription}`);
+        }
+        else if ((0, mablscript_step_types_1.isStepWithReusableFlow)(step) &&
             step.flow &&
             !(0, type_utils_1.isAutoLoginFlow)(step.flow)) {
             const flowName = step.flow.description ?? 'Unknown flow';
@@ -48,20 +72,16 @@ function processStepsWithDescriptions(steps, variables, cursorIndex, state) {
             stepList.push(`End execute flow: ${flowName}`);
         }
         else {
-            const stepDescription = parsedTask
-                ? `${parsedTask}`
-                : (0, humanize_1.humanizeStepDescription)(step, variables);
-            stepList.push(stepDescription);
-        }
-        if (parsedTask) {
-            tasks.push(parsedTask);
-            const wasBeforeCursor = !cursorFound && !isAtCursor;
-            if (wasBeforeCursor) {
-                currentTaskIndex++;
-            }
+            stepList.push((0, humanize_1.humanizeStepDescription)(step, variables));
         }
     });
-    return { stepList, tasks, currentTaskIndex };
+    if (!cursorFound &&
+        cursorIsAtThisDepth &&
+        cursorAtThisDepth === steps.length) {
+        cursorFound = true;
+        stepList.push(contextBuilder_1.CURSOR_MARKER);
+    }
+    return { stepList, tasks, currentTaskIndex, cursorFound };
 }
 function buildVariablesMap(variables, cursorIndex) {
     const variablesList = (0, variable_utils_1.getUsableVariablesAsList)(variables, cursorIndex);
@@ -80,16 +100,20 @@ function buildTestExecutionStateArtifact(options) {
     const steps = state.getSteps();
     const variables = state.getVariables();
     const variablesMap = buildVariablesMap(variables, cursorIndex);
-    const { stepList, tasks, currentTaskIndex } = processStepsWithDescriptions(steps, variables, cursorIndex, state);
+    const { stepList, tasks, currentTaskIndex, cursorFound } = processStepsWithDescriptions(steps, variables, cursorIndex, state);
+    if (!cursorFound) {
+        stepList.push(contextBuilder_1.CURSOR_MARKER);
+    }
     const lastToolsExecuted = state.getLastToolsExecuted();
     const lastTaskStatus = lastToolsExecuted?.map((tool) => ({
         success: tool.toolResult?.success ?? false,
         steps_created: tool.toolResult?.createdStepsInfo?.map((info) => info.humanizedStep.step) ?? [],
         action: tool.toolCall?.toolName,
     })) ?? [];
+    const flattenedCursorPosition = stepList.indexOf(contextBuilder_1.CURSOR_MARKER);
     const testExecutionState = {
         fullStepList: stepList,
-        cursorPosition: cursorIndex[0] ?? 0,
+        cursorPosition: flattenedCursorPosition >= 0 ? flattenedCursorPosition : stepList.length,
         currentTaskIndex: tasks.length === 0 ? 0 : currentTaskIndex,
         variables: variablesMap,
         lastTaskStatus,

package/trainer/cli/runAgenticGeneration.js

@@ -47,6 +47,8 @@ const CliEventHandler_1 = require("./CliEventHandler");
 const ViewportStep_1 = __importDefault(require("../sharedUtils/mablscript/canonical/ViewportStep"));
 const VisitUrlStep_1 = __importDefault(require("../sharedUtils/mablscript/canonical/VisitUrlStep"));
 const domUtil_1 = require("../../domUtil");
+const mablscript_step_types_1 = require("../sharedUtils/mablscript-step-types");
+const humanize_1 = require("../sharedUtils/mablscript/humanize");
 const sessionHelpers_1 = require("./sessionHelpers");
 const chalk = require('chalk');
 function createReadlineInterface() {
@@ -62,6 +64,16 @@ function printStartupInfo(resolvedSession, headless) {
     console.log(chalk.gray('  Headless:'), chalk.white(String(headless)));
     console.log();
 }
+function printStepsRecursively(steps, variables, prefix = '', indent = '  ') {
+    steps.forEach((step, index) => {
+        const stepNumber = prefix ? `${prefix}.${index + 1}` : `${index + 1}`;
+        const description = step.annotations?.description || (0, humanize_1.humanizeStepDescription)(step, variables);
+        console.log(chalk.gray(`${indent}${stepNumber}.`), chalk.white(description));
+        if ((0, mablscript_step_types_1.isStepGroupStep)(step) && step.stepsInGroup.length > 0) {
+            printStepsRecursively(step.stepsInGroup, variables, stepNumber, indent + '  ');
+        }
+    });
+}
 function createResultProcessor() {
     return (result) => {
         const isError = result.status === 'failed';
@@ -135,7 +147,7 @@ async function runAgenticGeneration(options) {
                 return state;
             },
             createTrainingContext: (page, browser, onNewTabDetected) => new CliTrainingContext_1.CliTrainingContext({ page, browser, onNewTabDetected }),
-            createStateProvider: (state, trainingContext, flowCache) => new CliStateProvider_1.CliStateProvider(state, trainingContext, flowCache),
+            createStateProvider: (state, trainingContext, flowCache, accountFeatures) => new CliStateProvider_1.CliStateProvider(state, trainingContext, flowCache, accountFeatures),
             createEventHandler: (opts) => new CliEventHandler_1.CliEventHandler({
                 state: opts.state,
                 trainingContext: opts.trainingContext,
@@ -148,11 +160,9 @@ async function runAgenticGeneration(options) {
             processResult: createResultProcessor(),
         });
         const result = await runner.run();
-        if (result.steps.length > 0) {
+        if (result.rawSteps.length > 0) {
             console.log(chalk.bold('Generated Steps:'));
-            result.steps.forEach((step, index) => {
-                console.log(chalk.gray(`  ${index + 1}.`), chalk.white(step));
-            });
+            printStepsRecursively(result.rawSteps, result.variables);
             console.log();
         }
         if (result.saveResult) {

package/trainer/generation/AgenticGenerationRunner.js

@@ -102,13 +102,14 @@ class AgenticGenerationRunner {
     }
     async createBrowserAndNavigate() {
         this.logger.info('Creating browser and navigating to URL');
-        const { testContext } = await (0, createTrainingTestContext_1.createTrainingTestContext)({
+        const { testContext, accountFeatures } = await (0, createTrainingTestContext_1.createTrainingTestContext)({
             workspaceId: this.config.workspaceId,
             applicationId: this.config.applicationId,
             url: this.config.url,
             apiClient: this.config.apiClient,
             idPrefix: 'gen',
         });
+        this.accountFeatures = accountFeatures;
         const browserConfig = {
             height: 900,
             width: 1280,
@@ -156,7 +157,7 @@ class AgenticGenerationRunner {
             });
         });
         await this.trainingContext.initialize();
-        this.stateProvider = this.providers.createStateProvider(this.state, this.trainingContext, this.flowCache);
+        this.stateProvider = this.providers.createStateProvider(this.state, this.trainingContext, this.flowCache, this.accountFeatures);
         this.eventHandler = this.providers.createEventHandler({
             state: this.state,
             trainingContext: this.trainingContext,
@@ -243,6 +244,7 @@ class AgenticGenerationRunner {
                 trainingSessionId: loopResult.trainingSessionId,
                 status: loopResult.status,
                 rawSteps: loopResult.steps,
+                variables: loopResult.variables,
                 error: loopResult.pendingAskForHelp.question,
             };
         }
@@ -255,6 +257,7 @@ class AgenticGenerationRunner {
             trainingSessionId: loopResult.trainingSessionId,
             status: loopResult.status,
             rawSteps: loopResult.steps,
+            variables: loopResult.variables,
             error: loopResult.status === generation_types_1.TestGenerationStatus.Failed
                 ? 'Generation failed'
                 : undefined,
@@ -270,6 +273,7 @@ class AgenticGenerationRunner {
             trainingSessionId: this.state?.getTrainingSessionId() ?? '',
             status: generation_types_1.TestGenerationStatus.Failed,
             rawSteps: [],
+            variables: this.state?.getVariables() ?? {},
         };
     }
     async cleanup() {

package/trainer/generation/TestGenerationOrchestrator.js

@@ -7,6 +7,7 @@ exports.TestGenerationOrchestrator = void 0;
 const async_retry_1 = __importDefault(require("async-retry"));
 const mablApi_1 = require("../../mablApi");
 const toolExecutors_1 = require("./toolExecutors");
+const boundingBoxUtils_1 = require("../sharedUtils/boundingBoxUtils");
 const contentActions_1 = require("../background/capture/contentActions");
 const generation_types_1 = require("../sharedUtils/generation-types");
 const messageConversion_1 = require("../sharedUtils/messageConversion");
@@ -252,7 +253,9 @@ class TestGenerationOrchestrator {
             };
             this.logger.info('[runGenerationLoop] Tool call information', JSON.stringify(toolCall, undefined, 2));
             if (toolExecutor.needsFind(toolCall)) {
-                const boundingBox = TestGenerationOrchestrator.buildBoundingBox(toolCall.toolParams?.elementBoundingBox);
+                const boundingBox = toolCall.toolParams?.elementBoundingBox
+                    ? (0, boundingBoxUtils_1.convertToolLibraryBoundingBox)(toolCall.toolParams.elementBoundingBox)
+                    : undefined;
                 if (!boundingBox) {
                     this.logger.error(`Tool ${originalToolCall.name} requires element location but no bounding box was provided by the API`);
                     skippedTools.push({
@@ -452,17 +455,6 @@ class TestGenerationOrchestrator {
                 return true;
         }
     }
-    static buildBoundingBox(responseBoundingBox) {
-        if (!responseBoundingBox) {
-            return undefined;
-        }
-        return {
-            x: responseBoundingBox.left,
-            y: responseBoundingBox.top,
-            width: responseBoundingBox.right - responseBoundingBox.left,
-            height: responseBoundingBox.bottom - responseBoundingBox.top,
-        };
-    }
     async captureToolOutputContext(success, toolName, tabsBefore = []) {
         const { needsScreenshot, needsUrl, needsTabInfo } = (0, toolExecutors_1.toolNeedsPostExecutionContext)(toolName, success);
         const context = {};
@@ -522,7 +514,7 @@ class TestGenerationOrchestrator {
         const cursorPosition = cursorIndex[0];
         let hasStartTaskBeforeCursor = false;
         for (let i = 0; i < cursorPosition && i < steps.length; i++) {
-            const parsedTask = (0, contextBuilder_1.parseTaskFromEchoStep)(steps[i]);
+            const parsedTask = (0, contextBuilder_1.parseTaskFromStep)(steps[i]) ?? (0, contextBuilder_1.parseTaskFromEchoStep)(steps[i]);
             if (parsedTask) {
                 hasStartTaskBeforeCursor = true;
                 break;
@@ -564,8 +556,13 @@ class TestGenerationOrchestrator {
             return;
         }
         this.logger.info(`Adding initial start task step: ${firstTaskDescription}`);
-        const startTaskResult = (0, RecordStartTaskExecutor_1.recordStartTaskStep)(firstTaskDescription);
-        await this.eventHandler.dispatchSteps(startTaskResult.steps);
+        const useStepGroups = this.stateProvider.hasStepGroupsFeature();
+        const startTaskResult = useStepGroups
+            ? (0, RecordStartTaskExecutor_1.recordStartTaskStep)(firstTaskDescription)
+            : (0, RecordStartTaskExecutor_1.recordStartTaskEchoStep)(firstTaskDescription);
+        await this.eventHandler.dispatchSteps(startTaskResult.steps, {
+            skipActiveGroupInsertion: useStepGroups,
+        });
     }
 }
 exports.TestGenerationOrchestrator = TestGenerationOrchestrator;

package/trainer/generation/toolExecutors/CompleteTaskExecutor.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.completeTaskExecutor = void 0;
-const mablApi_1 = require("../../../mablApi");
 const RecordStartTaskExecutor_1 = require("./RecordStartTaskExecutor");
 const contextBuilder_1 = require("../../sharedUtils/contextBuilder");
 exports.completeTaskExecutor = {
     needsFind: () => false,
-    getStepType: () => mablApi_1.ExecuteToolName.CompleteTask,
+    getStepType: () => 'complete_task',
     execute: async (payload, stateProvider, eventHandler, logger) => {
         const lastToolsExecuted = stateProvider.getLastToolsExecuted();
         const someStepFailed = lastToolsExecuted?.some((tool) => !!tool.generatedSteps && !tool.toolResult.success);
@@ -17,7 +16,11 @@ exports.completeTaskExecutor = {
                 errorMessage: 'Cannot complete task because a generated step failed.',
             });
         }
-        const { isLastTask, nextTaskDescription, newTaskIndex } = checkTaskStatus(stateProvider, logger);
+        const useStepGroups = stateProvider.hasStepGroupsFeature();
+        if (useStepGroups) {
+            eventHandler.moveCursorOutOfGroup();
+        }
+        const { isLastTask, nextTaskDescription, newTaskIndex } = checkTaskStatus(stateProvider, eventHandler, logger);
         eventHandler.completeTask();
         const stopCondition = payload.session.stopCondition;
         if (stopCondition === 'generated-task') {
@@ -41,8 +44,17 @@ exports.completeTaskExecutor = {
         if (nextTaskDescription) {
             logger.info(`Creating start task step for next task: ${nextTaskDescription}`);
             try {
-                const startTaskResult = (0, RecordStartTaskExecutor_1.recordStartTaskStep)(nextTaskDescription);
-                await eventHandler.dispatchSteps(startTaskResult.steps);
+                const startTaskResult = useStepGroups
+                    ? (0, RecordStartTaskExecutor_1.recordStartTaskStep)(nextTaskDescription)
+                    : (0, RecordStartTaskExecutor_1.recordStartTaskEchoStep)(nextTaskDescription);
+                await eventHandler.dispatchSteps(startTaskResult.steps, {
+                    skipActiveGroupInsertion: useStepGroups,
+                });
+                if (useStepGroups) {
+                    if (!eventHandler.isInsideStepGroup()) {
+                        eventHandler.moveCursorIntoGroup();
+                    }
+                }
             }
             catch (error) {
                 logger.error('Error creating next start task step:', error);
@@ -59,7 +71,7 @@ exports.completeTaskExecutor = {
         });
     },
 };
-function checkTaskStatus(stateProvider, logger) {
+function checkTaskStatus(stateProvider, eventHandler, logger) {
     const testOutlineArtifact = stateProvider.getArtifact('test_outline');
     const simpleOutlineArtifact = stateProvider.getArtifact('simple_test_outline');
     const hasTestOutline = testOutlineArtifact && testOutlineArtifact.artifact_type === 'inline';
@@ -71,33 +83,33 @@ function checkTaskStatus(stateProvider, logger) {
     if (hasTestOutline) {
         const data = testOutlineArtifact.artifact_data?.value;
         if (data?.tasks) {
-            return getTaskInfo(data, stateProvider, logger);
+            return getTaskInfo(data, stateProvider, eventHandler, logger);
         }
         logger.warn('test_outline artifact exists but has no data or tasks');
     }
     if (hasSimpleOutline) {
         const data = simpleOutlineArtifact.artifact_data?.value;
         if (data?.tasks) {
-            return getTaskInfo(data, stateProvider, logger);
+            return getTaskInfo(data, stateProvider, eventHandler, logger);
         }
         logger.warn('simple_test_outline artifact exists but has no data or tasks');
     }
     logger.warn('Outline artifacts found but contain no valid task data, assuming not last task');
     return { isLastTask: false };
 }
-function getTaskInfo(outline, stateProvider, logger) {
+function getTaskInfo(outline, stateProvider, eventHandler, logger) {
     if (!outline?.tasks || outline.tasks.length === 0) {
         logger.info('No tasks in outline, not ending test');
         return { isLastTask: false };
     }
     const steps = stateProvider.getSteps();
-    const cursorIndex = stateProvider.getNextStepIndex();
+    const cursorIndex = eventHandler.getNextStepIndex();
     let currentTaskIndex = 0;
     if (cursorIndex.length === 1) {
         const cursorPosition = cursorIndex[0];
         let taskCount = 0;
         for (let i = 0; i < cursorPosition && i < steps.length; i++) {
-            const parsedTask = (0, contextBuilder_1.parseTaskFromEchoStep)(steps[i]);
+            const parsedTask = (0, contextBuilder_1.parseTaskFromStep)(steps[i]) ?? (0, contextBuilder_1.parseTaskFromEchoStep)(steps[i]);
             if (parsedTask) {
                 taskCount++;
             }

package/trainer/generation/toolExecutors/DeleteLastStepsExecutor.js

@@ -6,7 +6,8 @@ exports.deleteLastStepsExecutor = {
     needsFind: () => false,
     getStepType: () => mablApi_1.ExecuteToolName.DeleteLastSteps,
     execute: (payload, _stateProvider, eventHandler, logger) => {
-        const toolParams = payload.toolCall.toolParams;
+        const toolParams = payload.toolCall
+            .toolParams;
         const { stepsToDelete } = toolParams;
         if (typeof stepsToDelete !== 'number' || stepsToDelete <= 0) {
             logger.error('Invalid stepsToDelete for RecordDeleteLastStepsExecutor');

package/trainer/generation/toolExecutors/RecordAssertElementExecutor.js

@@ -9,7 +9,8 @@ exports.recordAssertElementExecutor = {
     needsFind: () => true,
     getStepType: () => 'assert',
     execute: async (payload, stateProvider, eventHandler, logger) => {
-        const toolParams = payload.toolCall.toolParams;
+        const toolParams = payload.toolCall
+            .toolParams;
         if (!payload.find || !payload.contextInfo) {
             logger.error('RecordAssertElementExecutor requires find and contextInfo');
             return {
@@ -37,6 +38,6 @@ exports.recordAssertElementExecutor = {
                 elementAttrProp: 'innerText',
             },
         };
-        return (0, toolExecutors_1.recordStepAndTrackResult)(() => (0, stepCapture_1.recordTrainedStep)(step, payload.contextInfo, true, payload.toolCall.toolParams?.description, stateProvider, eventHandler), 0, stateProvider, eventHandler, logger);
+        return (0, toolExecutors_1.recordStepAndTrackResult)(() => (0, stepCapture_1.recordTrainedStep)(step, payload.contextInfo, true, undefined, stateProvider, eventHandler), 0, stateProvider, eventHandler, logger);
     },
 };

package/trainer/generation/toolExecutors/RecordAssertionExecutor.js

@@ -6,14 +6,9 @@ const generation_types_1 = require("../../sharedUtils/generation-types");
 const ExtractDescriptor_1 = require("../../../mablscript/types/ExtractDescriptor");
 const AssertStep_1 = require("../../../mablscript/steps/AssertStep");
 const stepExecution_1 = require("../../sharedUtils/stepExecution");
-const translateMablscript_1 = require("../../sharedUtils/capture/translateMablscript");
-const mablscriptFind_1 = require("../../../mablscriptFind");
 const stepCapture_1 = require("../../background/capture/stepCapture");
 exports.recordAssertionExecutor = {
-    needsFind: (toolCall) => {
-        const toolParams = toolCall.toolParams;
-        return isAssertToolParams(toolParams) && !!toolParams.elementBoundingBox;
-    },
+    needsFind: () => false,
     getStepType: () => 'assert',
     execute: async (payload, stateProvider, eventHandler, logger) => {
         const toolParams = payload.toolCall.toolParams;
@@ -23,28 +18,14 @@ exports.recordAssertionExecutor = {
                 success: false,
             };
         }
-        const isElementAssert = !!toolParams.elementBoundingBox;
-        if (isElementAssert) {
-            if (!payload.find || !payload.contextInfo) {
-                logger.error('Record assertion tool executor with element bounding box requires find and context info');
-                return {
-                    success: false,
-                };
-            }
-        }
-        if ((0, toolExecutors_1.isFindOneEventMessage)(payload.find)) {
-            delete payload.find.stepType;
-        }
-        const step = (0, toolExecutors_1.isFindOneEventMessage)(payload.find)
-            ? { ...payload.find, listener: 'mouse-select' }
-            : {
-                selectionType: 'viewport',
-                listener: 'viewport-assert',
-                findDescriptor: {
-                    type: 'viewport',
-                },
-                action: 'record',
-            };
+        const step = {
+            selectionType: 'viewport',
+            listener: 'viewport-assert',
+            findDescriptor: {
+                type: 'viewport',
+            },
+            action: 'record',
+        };
         step.assertion = {
             assertionType: 'ai_prompt',
             assertionTarget: 'element',
@@ -54,14 +35,11 @@ exports.recordAssertionExecutor = {
             },
             extractionType: ExtractDescriptor_1.ExtractType.EXTRACT_PROMPT,
             onFailure: AssertStep_1.OnFailure.FailTestAtEnd,
-            selectionType: isElementAssert ? 'element' : 'viewport',
-            elementScreenshot: isElementAssert,
+            selectionType: 'viewport',
+            elementScreenshot: false,
         };
         const contextInfo = payload.contextInfo ?? (await stateProvider.getActiveContextInfo());
-        const findDescriptor = isElementAssert && (0, toolExecutors_1.isFindOneEventMessage)(payload.find)
-            ?
-                (0, translateMablscript_1.createFindDescriptor)(payload.find, new mablscriptFind_1.ElementSelectorStore())
-            : { type: 'viewport' };
+        const findDescriptor = { type: 'viewport' };
         const variables = stateProvider.getVariables();
         const testAssertionResult = await (0, stepExecution_1.runAIAssertion)(eventHandler, variables, findDescriptor, step.assertion, contextInfo.frameId, `${contextInfo.tabId}`);
         step.assertion.aiPrompt.criteria =
@@ -74,7 +52,7 @@ exports.recordAssertionExecutor = {
                 success: false,
             };
         }
-        return (0, toolExecutors_1.recordStepAndTrackResult)(() => (0, stepCapture_1.recordTrainedStep)(step, contextInfo, true, payload.toolCall.toolParams?.description, stateProvider, eventHandler), 0, stateProvider, eventHandler, logger);
+        return (0, toolExecutors_1.recordStepAndTrackResult)(() => (0, stepCapture_1.recordTrainedStep)(step, contextInfo, true, undefined, stateProvider, eventHandler), 0, stateProvider, eventHandler, logger);
     },
 };
 function isAssertToolParams(toolParams) {