donobu 5.25.5 → 5.26.0

package/dist/esm/lib/ai/PageAi.d.ts

@@ -139,6 +139,7 @@ export declare class PageAiRunner {
 export declare class PageAi {
     private readonly cache;
     private readonly runner;
+    private readonly donobu;
     /**
      * @param donobu Donobu stack providing flow managers and shared services.
      * @param gptClient GPT client used for autonomous reasoning.

package/dist/esm/lib/ai/PageAi.js

@@ -133,6 +133,7 @@ class PageAi {
      */
     constructor(donobu, gptClient, cache) {
         this.cache = cache;
+        this.donobu = donobu;
         this.runner = new PageAiRunner(donobu, gptClient);
     }
     /**
@@ -188,7 +189,7 @@ class PageAi {
                 }), {
                     areElementIdsVolatile: options?.volatileElementIds,
                     disableSelectorFailover: options?.noSelectorFailover,
-                });
+                }, this.donobu.toolRegistry);
                 const cacheEntry = cacheEntryBuilder_1.PageAiCacheEntryBuilder.fromMetadata(descriptor.key.pageUrl, runResult.donobuFlow.metadata, preparedToolCalls);
                 await this.cache.put(cacheEntry);
             }

package/dist/esm/main.d.ts

@@ -22,7 +22,7 @@ export * from './lib/test/fixtures/gptClients';
 export * from './lib/test/testExtension';
 export * from './lib/test/utils/donobuTestStack';
 export { DonobuFlow } from './managers/DonobuFlow';
-export { distillAllowedEnvVariableNames, DonobuFlowsManager, } from './managers/DonobuFlowsManager';
+export { distillAllowedEnvVariableNames, DonobuFlowsManager, prepareToolCallsForRerun, } from './managers/DonobuFlowsManager';
 export { type DonobuStack, setupDonobuStack } from './managers/DonobuStack';
 export { InteractionVisualizer } from './managers/InteractionVisualizer';
 export { type LoadedPlugins, type PluginDependencies, PluginLoader, } from './managers/PluginLoader';

package/dist/esm/main.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TargetRuntimePluginRegistry = exports.PersistencePluginRegistry = exports.createDefaultToolRegistry = exports.ToolManager = exports.PluginLoader = exports.InteractionVisualizer = exports.setupDonobuStack = exports.DonobuFlowsManager = exports.distillAllowedEnvVariableNames = exports.DonobuFlow = exports.env = exports.runGenerateSiteTests = exports.VercelAiGptClient = exports.OpenAiGptClient = exports.GptClientPluginRegistry = exports.GptClient = exports.GoogleGenerativeAiGptClient = exports.fixAssertFields = exports.DonobuGptClient = exports.AnthropicGptClient = void 0;
+exports.TargetRuntimePluginRegistry = exports.PersistencePluginRegistry = exports.createDefaultToolRegistry = exports.ToolManager = exports.PluginLoader = exports.InteractionVisualizer = exports.setupDonobuStack = exports.prepareToolCallsForRerun = exports.DonobuFlowsManager = exports.distillAllowedEnvVariableNames = exports.DonobuFlow = exports.env = exports.runGenerateSiteTests = exports.VercelAiGptClient = exports.OpenAiGptClient = exports.GptClientPluginRegistry = exports.GptClient = exports.GoogleGenerativeAiGptClient = exports.fixAssertFields = exports.DonobuGptClient = exports.AnthropicGptClient = void 0;
 exports.startDonobuServer = startDonobuServer;
 const commander_1 = require("commander");
 const v4_1 = require("zod/v4");
@@ -61,6 +61,7 @@ Object.defineProperty(exports, "DonobuFlow", { enumerable: true, get: function (
 var DonobuFlowsManager_1 = require("./managers/DonobuFlowsManager");
 Object.defineProperty(exports, "distillAllowedEnvVariableNames", { enumerable: true, get: function () { return DonobuFlowsManager_1.distillAllowedEnvVariableNames; } });
 Object.defineProperty(exports, "DonobuFlowsManager", { enumerable: true, get: function () { return DonobuFlowsManager_1.DonobuFlowsManager; } });
+Object.defineProperty(exports, "prepareToolCallsForRerun", { enumerable: true, get: function () { return DonobuFlowsManager_1.prepareToolCallsForRerun; } });
 var DonobuStack_1 = require("./managers/DonobuStack");
 Object.defineProperty(exports, "setupDonobuStack", { enumerable: true, get: function () { return DonobuStack_1.setupDonobuStack; } });
 var InteractionVisualizer_1 = require("./managers/InteractionVisualizer");

package/dist/esm/managers/DonobuFlowsManager.d.ts

@@ -209,32 +209,20 @@ export declare function distillAllowedEnvVariableNames(overallObjective: string
 export declare function setupAllowedTools(flowParams: Pick<CreateDonobuFlow, 'customTools' | 'toolCallsOnStart' | 'allowedTools'>, hasGptClient: boolean, targetType: string, toolRegistry: ToolRegistry): Promise<Tool<z.ZodObject, z.ZodObject>[]>;
 /**
  * Convert an *executed* list of {@link ToolCall}s into a list of
- * {@link ProposedToolCall}s that can be replayed in a fresh browser
- * session.
+ * {@link ProposedToolCall}s that can be replayed in a fresh session.
  *
- * ### What happens?
- * 1. **Identify calls that need selector-remapping.**
- *    Some tools (e.g. {@link ClickTool}, {@link InputTextTool}) rely on a
- *    deterministic selector captured at runtime.  These tool names live in
- *    `toolsThatNeedRemappedInputs`.
- * 2. **Attempt remap with {@link ReplayableInteraction.prepareToolCallForRerun}.**
- *    If a call belongs to that set, we delegate to
- *    `ReplayableInteraction.remapForRerun` to inject the stored selector and
- *    strip any transient GPT-only fields.
- * 3. **Pass through other calls unchanged.**
- *    Tools that have no UI footprint (e.g. navigation helpers, assertions)
- *    are copied verbatim.
- * 4. **Error handling.**
- *    When remapping fails (e.g. selector metadata missing) we *skip* the
- *    offending call, emit a warning via `appLogger`, and continue processing
- *    the remainder so that a “best-effort” replay is still possible.
+ * For each call, we look up the {@link Tool} in the given registry and
+ * delegate to its `prepareForRerun` override. Tools that need selector
+ * remapping (e.g. {@link ClickTool}, {@link InputTextTool}, the mobile
+ * interaction tools) each own their own logic; tools with no replay-
+ * specific needs inherit the passthrough default from {@link Tool}.
  *
- * The resulting array preserves the original order **minus** any calls that
- * could not be remapped.
+ * When a tool is not registered (stale flow, removed tool) or
+ * `prepareForRerun` throws (e.g. missing selector metadata), the call
+ * is passed through or skipped with an `appLogger.warn` — "best-effort
+ * replay" behavior is preserved.
  *
- * @param toolCalls – The chronologically ordered list of executed
- *                   {@link ToolCall}s.
  * @returns A list of {@link ProposedToolCall}s ready for replay.
  */
-export declare function prepareToolCallsForRerun(toolCalls: ToolCall[], options: CodeGenerationOptions): Promise<ProposedToolCall[]>;
+export declare function prepareToolCallsForRerun(toolCalls: ToolCall[], options: CodeGenerationOptions, toolRegistry: ToolRegistry): Promise<ProposedToolCall[]>;
 //# sourceMappingURL=DonobuFlowsManager.d.ts.map

package/dist/esm/managers/DonobuFlowsManager.js

@@ -51,18 +51,7 @@ const ToolRequiresGptException_1 = require("../exceptions/ToolRequiresGptExcepti
 const UnknownToolException_1 = require("../exceptions/UnknownToolException");
 const GptConfig_1 = require("../models/GptConfig");
 const resolveTargetRuntime_1 = require("../targets/resolveTargetRuntime");
-const ChooseSelectOptionTool_1 = require("../tools/ChooseSelectOptionTool");
-const ClickTool_1 = require("../tools/ClickTool");
 const CustomToolRunnerTool_1 = require("../tools/CustomToolRunnerTool");
-const DoubleClickTool_1 = require("../tools/DoubleClickTool");
-const HoverOverElementTool_1 = require("../tools/HoverOverElementTool");
-const InputFakerTool_1 = require("../tools/InputFakerTool");
-const InputRandomizedEmailAddressTool_1 = require("../tools/InputRandomizedEmailAddressTool");
-const InputTextTool_1 = require("../tools/InputTextTool");
-const PressKeyTool_1 = require("../tools/PressKeyTool");
-const RememberPageTextTool_1 = require("../tools/RememberPageTextTool");
-const ReplayableInteraction_1 = require("../tools/ReplayableInteraction");
-const ScrollPageTool_1 = require("../tools/ScrollPageTool");
 const FlowLogBuffer_1 = require("../utils/FlowLogBuffer");
 const Logger_1 = require("../utils/Logger");
 const MiscUtils_1 = require("../utils/MiscUtils");
@@ -291,11 +280,9 @@ class DonobuFlowsManager {
     async getToolCallsForRerun(priorFlowMetadata, options) {
         const originalToolCalls = await this.getToolCalls(priorFlowMetadata.id);
         // Delegate tool call preparation to the target runtime plugin so that
-        // rerun logic is fully target-agnostic.
-        const plugin = this.targetRuntimePlugins.get(priorFlowMetadata.target);
-        return plugin
-            ? await plugin.prepareToolCallsForRerun(originalToolCalls, options)
-            : await prepareToolCallsForRerun(originalToolCalls, options);
+        // rerun logic is fully target-agnostic — it dispatches per tool via
+        // the tool's own `prepareForRerun` override.
+        return prepareToolCallsForRerun(originalToolCalls, options, this.toolRegistry);
     }
     /**
      * Loads the given flow by ID and returns a `CreateDonobuFlow` object that can be passed to `createFlow`
@@ -460,7 +447,7 @@ class DonobuFlowsManager {
         const flowMetadata = await this.getFlowById(flowId);
         // Do not generate code for non-successful tool calls.
         const originalToolCalls = (await this.getToolCalls(flowId)).filter((tc) => tc.outcome?.isSuccessful);
-        const proposedToolCalls = await prepareToolCallsForRerun(originalToolCalls, effectiveOptions);
+        const proposedToolCalls = await prepareToolCallsForRerun(originalToolCalls, effectiveOptions, this.toolRegistry);
         const scriptVariant = effectiveOptions.playwrightScriptVariant === 'classic' ? 'classic' : 'ai';
         if (scriptVariant === 'classic') {
             return (0, CodeGenerator_1.getFlowAsPlaywrightScript)(flowMetadata, proposedToolCalls, effectiveOptions, this.toolRegistry);
@@ -478,9 +465,9 @@ class DonobuFlowsManager {
         const flowsWithToolCalls = await Promise.all(flowIds.map(async (flowId) => {
             const metadata = await this.getFlowById(flowId);
             const toolCalls = await this.getToolCalls(flowId);
-            // Filter out unsuccessful tool calls and prepare them for replay
+            // Filter out unsuccessful tool calls and prepare them for replay.
             const successfulToolCalls = toolCalls.filter((tc) => tc.outcome?.isSuccessful);
-            const proposedToolCalls = await prepareToolCallsForRerun(successfulToolCalls, options);
+            const proposedToolCalls = await prepareToolCallsForRerun(successfulToolCalls, options, this.toolRegistry);
             return {
                 metadata,
                 toolCalls: proposedToolCalls,
@@ -866,65 +853,40 @@ async function throwIfAnyToolsRequireGpt(requestedTools, toolCallsOnStart, toolR
 }
 /**
  * Convert an *executed* list of {@link ToolCall}s into a list of
- * {@link ProposedToolCall}s that can be replayed in a fresh browser
- * session.
+ * {@link ProposedToolCall}s that can be replayed in a fresh session.
  *
- * ### What happens?
- * 1. **Identify calls that need selector-remapping.**
- *    Some tools (e.g. {@link ClickTool}, {@link InputTextTool}) rely on a
- *    deterministic selector captured at runtime.  These tool names live in
- *    `toolsThatNeedRemappedInputs`.
- * 2. **Attempt remap with {@link ReplayableInteraction.prepareToolCallForRerun}.**
- *    If a call belongs to that set, we delegate to
- *    `ReplayableInteraction.remapForRerun` to inject the stored selector and
- *    strip any transient GPT-only fields.
- * 3. **Pass through other calls unchanged.**
- *    Tools that have no UI footprint (e.g. navigation helpers, assertions)
- *    are copied verbatim.
- * 4. **Error handling.**
- *    When remapping fails (e.g. selector metadata missing) we *skip* the
- *    offending call, emit a warning via `appLogger`, and continue processing
- *    the remainder so that a “best-effort” replay is still possible.
+ * For each call, we look up the {@link Tool} in the given registry and
+ * delegate to its `prepareForRerun` override. Tools that need selector
+ * remapping (e.g. {@link ClickTool}, {@link InputTextTool}, the mobile
+ * interaction tools) each own their own logic; tools with no replay-
+ * specific needs inherit the passthrough default from {@link Tool}.
  *
- * The resulting array preserves the original order **minus** any calls that
- * could not be remapped.
+ * When a tool is not registered (stale flow, removed tool) or
+ * `prepareForRerun` throws (e.g. missing selector metadata), the call
+ * is passed through or skipped with an `appLogger.warn` — "best-effort
+ * replay" behavior is preserved.
  *
- * @param toolCalls – The chronologically ordered list of executed
- *                   {@link ToolCall}s.
  * @returns A list of {@link ProposedToolCall}s ready for replay.
  */
-async function prepareToolCallsForRerun(toolCalls, options) {
-    // Tools that need special handling for their inputs during replay.
-    const toolsThatNeedRemappedInputs = new Set([
-        ChooseSelectOptionTool_1.ChooseSelectOptionTool.NAME,
-        ClickTool_1.ClickTool.NAME,
-        DoubleClickTool_1.DoubleClickTool.NAME,
-        HoverOverElementTool_1.HoverOverElementTool.NAME,
-        InputFakerTool_1.InputFakerTool.NAME,
-        InputRandomizedEmailAddressTool_1.InputRandomizedEmailAddressTool.NAME,
-        InputTextTool_1.InputTextTool.NAME,
-        PressKeyTool_1.PressKeyTool.NAME,
-        RememberPageTextTool_1.RememberPageTextTool.NAME,
-        ScrollPageTool_1.ScrollPageTool.NAME,
-    ]);
+async function prepareToolCallsForRerun(toolCalls, options, toolRegistry) {
+    const toolsByName = new Map(toolRegistry.allTools().map((tool) => [tool.name, tool]));
     const proposedToolCalls = [];
     for (const toolCall of toolCalls) {
-        const needsRemappedInputs = toolsThatNeedRemappedInputs.has(toolCall.toolName);
-        if (needsRemappedInputs) {
-            try {
-                proposedToolCalls.push(ReplayableInteraction_1.ReplayableInteraction.prepareToolCallForRerun(toolCall, options));
-            }
-            catch (e) {
-                // Skip.
-                Logger_1.appLogger.warn(`Failed to prepare tool call for rerun: ${JSON.stringify(toolCall)}`, e);
-            }
-        }
-        else {
-            // This is just a normal tool then.
+        const tool = toolsByName.get(toolCall.toolName);
+        if (!tool) {
+            // Tool no longer registered (e.g. stale flow referencing a removed
+            // tool). Passthrough so we don't silently drop the call.
             proposedToolCalls.push({
                 name: toolCall.toolName,
                 parameters: toolCall.parameters,
             });
+            continue;
+        }
+        try {
+            proposedToolCalls.push(tool.prepareForRerun(toolCall, options));
+        }
+        catch (e) {
+            Logger_1.appLogger.warn(`Failed to prepare tool call for rerun: ${JSON.stringify(toolCall)}`, e);
         }
     }
     return proposedToolCalls;

package/dist/esm/targets/TargetRuntimePlugin.d.ts

@@ -4,11 +4,8 @@ import type { env } from '../envVars';
 import type { InteractionVisualizer } from '../managers/InteractionVisualizer';
 import type { BrowserStateReference } from '../models/BrowserStateFlowReference';
 import type { BrowserStorageState } from '../models/BrowserStorageState';
-import type { CodeGenerationOptions } from '../models/CodeGenerationOptions';
 import type { ControlPanelFactory } from '../models/ControlPanel';
 import type { CreateDonobuFlow } from '../models/CreateDonobuFlow';
-import type { ProposedToolCall } from '../models/ProposedToolCall';
-import type { ToolCall } from '../models/ToolCall';
 import type { TargetRuntime } from './TargetRuntime';
 /**
  * Parameters passed to {@link TargetRuntimePlugin.createRuntime}.
@@ -80,13 +77,6 @@ export interface TargetRuntimePlugin {
      * the flow completes or errors.
      */
     createRuntime(params: TargetRuntimeParams): Promise<TargetRuntime>;
-    /**
-     * Prepare tool calls from a prior flow for deterministic replay.
-     *
-     * Each target provides its own replay logic. For example, the web target
-     * uses {@link ReplayableInteraction.prepareToolCallForRerun}.
-     */
-    prepareToolCallsForRerun(toolCalls: ToolCall[], options: CodeGenerationOptions): Promise<ProposedToolCall[]>;
 }
 /**
  * An immutable registry of target runtime plugins, keyed by target type.

package/dist/esm/targets/WebTargetRuntime.js

@@ -40,18 +40,7 @@ const path = __importStar(require("path"));
 const InvalidParamValueException_1 = require("../exceptions/InvalidParamValueException");
 const WebTargetInspector_1 = require("../managers/WebTargetInspector");
 const ControlPanel_1 = require("../models/ControlPanel");
-const ChooseSelectOptionTool_1 = require("../tools/ChooseSelectOptionTool");
-const ClickTool_1 = require("../tools/ClickTool");
-const DoubleClickTool_1 = require("../tools/DoubleClickTool");
 const GoToWebpageTool_1 = require("../tools/GoToWebpageTool");
-const HoverOverElementTool_1 = require("../tools/HoverOverElementTool");
-const InputFakerTool_1 = require("../tools/InputFakerTool");
-const InputRandomizedEmailAddressTool_1 = require("../tools/InputRandomizedEmailAddressTool");
-const InputTextTool_1 = require("../tools/InputTextTool");
-const PressKeyTool_1 = require("../tools/PressKeyTool");
-const RememberPageTextTool_1 = require("../tools/RememberPageTextTool");
-const ReplayableInteraction_1 = require("../tools/ReplayableInteraction");
-const ScrollPageTool_1 = require("../tools/ScrollPageTool");
 const BrowserUtils_1 = require("../utils/BrowserUtils");
 const Logger_1 = require("../utils/Logger");
 const PlaywrightUtils_1 = require("../utils/PlaywrightUtils");
@@ -263,37 +252,5 @@ exports.webTargetRuntimePlugin = {
     async createRuntime(params) {
         return WebTargetRuntime.create(params);
     },
-    async prepareToolCallsForRerun(toolCalls, options) {
-        const toolsThatNeedRemappedInputs = new Set([
-            ChooseSelectOptionTool_1.ChooseSelectOptionTool.NAME,
-            ClickTool_1.ClickTool.NAME,
-            DoubleClickTool_1.DoubleClickTool.NAME,
-            HoverOverElementTool_1.HoverOverElementTool.NAME,
-            InputFakerTool_1.InputFakerTool.NAME,
-            InputRandomizedEmailAddressTool_1.InputRandomizedEmailAddressTool.NAME,
-            InputTextTool_1.InputTextTool.NAME,
-            PressKeyTool_1.PressKeyTool.NAME,
-            RememberPageTextTool_1.RememberPageTextTool.NAME,
-            ScrollPageTool_1.ScrollPageTool.NAME,
-        ]);
-        const proposedToolCalls = [];
-        for (const toolCall of toolCalls) {
-            if (toolsThatNeedRemappedInputs.has(toolCall.toolName)) {
-                try {
-                    proposedToolCalls.push(ReplayableInteraction_1.ReplayableInteraction.prepareToolCallForRerun(toolCall, options));
-                }
-                catch (e) {
-                    Logger_1.appLogger.warn(`Failed to prepare tool call for rerun: ${JSON.stringify(toolCall)}`, e);
-                }
-            }
-            else {
-                proposedToolCalls.push({
-                    name: toolCall.toolName,
-                    parameters: toolCall.parameters,
-                });
-            }
-        }
-        return proposedToolCalls;
-    },
 };
 //# sourceMappingURL=WebTargetRuntime.js.map

package/dist/esm/tools/ReplayableInteraction.d.ts

@@ -180,7 +180,7 @@ export declare abstract class ReplayableInteraction<CoreSchema extends z.ZodObje
      * @returns A {@link ProposedToolCall} that can be executed in a fresh run.
      * @throws  Error if the original call lacks selector metadata.
      */
-    static prepareToolCallForRerun(toolCall: ToolCall, options: CodeGenerationOptions): ProposedToolCall;
+    prepareForRerun(toolCall: ToolCall, options: CodeGenerationOptions): ProposedToolCall;
 }
 export {};
 //# sourceMappingURL=ReplayableInteraction.d.ts.map

package/dist/esm/tools/ReplayableInteraction.js

@@ -590,7 +590,7 @@ class ReplayableInteraction extends Tool_1.Tool {
      * @returns A {@link ProposedToolCall} that can be executed in a fresh run.
      * @throws  Error if the original call lacks selector metadata.
      */
-    static prepareToolCallForRerun(toolCall, options) {
+    prepareForRerun(toolCall, options) {
         // If the tool call is from a GPT, we need the result metadata to continue.
         if (!('selector' in toolCall.parameters)) {
             if (!toolCall.outcome.metadata) {

package/dist/esm/tools/Tool.d.ts

@@ -1,4 +1,7 @@
 import type { z } from 'zod/v4';
+import type { CodeGenerationOptions } from '../models/CodeGenerationOptions';
+import type { ProposedToolCall } from '../models/ProposedToolCall';
+import type { ToolCall } from '../models/ToolCall';
 import type { ToolCallContext } from '../models/ToolCallContext';
 import type { ToolCallResult } from '../models/ToolCallResult';
 /** Represents a tool call to be invoked by a DonobuFlow. */
@@ -33,5 +36,16 @@ export declare abstract class Tool<CallSchema extends z.ZodObject, CallFromGptSc
      * Invoke the tool as made from a GPT with the given context and parameters.
      */
     abstract callFromGpt(context: ToolCallContext, parameters: z.infer<CallFromGptSchema>): Promise<ToolCallResult>;
+    /**
+     * Transform a completed tool call into a {@link ProposedToolCall} suitable
+     * for deterministic replay / code generation.
+     *
+     * The default implementation is a passthrough — `{ name, parameters }` —
+     * which is correct for tools that have no replay-specific logic
+     * (waits, assertions, markers, etc.). Tools that need to hoist
+     * selector metadata out of their outcome, strip LLM-only fields, or
+     * otherwise rewrite themselves override this method.
+     */
+    prepareForRerun(toolCall: ToolCall, _options: CodeGenerationOptions): ProposedToolCall;
 }
 //# sourceMappingURL=Tool.d.ts.map

package/dist/esm/tools/Tool.js

@@ -27,6 +27,22 @@ class Tool {
         this.controlPanelMessage = controlPanelMessage;
         this.supportedTargets = supportedTargets;
     }
+    /**
+     * Transform a completed tool call into a {@link ProposedToolCall} suitable
+     * for deterministic replay / code generation.
+     *
+     * The default implementation is a passthrough — `{ name, parameters }` —
+     * which is correct for tools that have no replay-specific logic
+     * (waits, assertions, markers, etc.). Tools that need to hoist
+     * selector metadata out of their outcome, strip LLM-only fields, or
+     * otherwise rewrite themselves override this method.
+     */
+    prepareForRerun(toolCall, _options) {
+        return {
+            name: toolCall.toolName,
+            parameters: toolCall.parameters,
+        };
+    }
 }
 exports.Tool = Tool;
 //# sourceMappingURL=Tool.js.map

package/dist/lib/ai/PageAi.d.ts

@@ -139,6 +139,7 @@ export declare class PageAiRunner {
 export declare class PageAi {
     private readonly cache;
     private readonly runner;
+    private readonly donobu;
     /**
      * @param donobu Donobu stack providing flow managers and shared services.
      * @param gptClient GPT client used for autonomous reasoning.

package/dist/lib/ai/PageAi.js

@@ -133,6 +133,7 @@ class PageAi {
      */
     constructor(donobu, gptClient, cache) {
         this.cache = cache;
+        this.donobu = donobu;
         this.runner = new PageAiRunner(donobu, gptClient);
     }
     /**
@@ -188,7 +189,7 @@ class PageAi {
                 }), {
                     areElementIdsVolatile: options?.volatileElementIds,
                     disableSelectorFailover: options?.noSelectorFailover,
-                });
+                }, this.donobu.toolRegistry);
                 const cacheEntry = cacheEntryBuilder_1.PageAiCacheEntryBuilder.fromMetadata(descriptor.key.pageUrl, runResult.donobuFlow.metadata, preparedToolCalls);
                 await this.cache.put(cacheEntry);
             }

package/dist/main.d.ts

@@ -22,7 +22,7 @@ export * from './lib/test/fixtures/gptClients';
 export * from './lib/test/testExtension';
 export * from './lib/test/utils/donobuTestStack';
 export { DonobuFlow } from './managers/DonobuFlow';
-export { distillAllowedEnvVariableNames, DonobuFlowsManager, } from './managers/DonobuFlowsManager';
+export { distillAllowedEnvVariableNames, DonobuFlowsManager, prepareToolCallsForRerun, } from './managers/DonobuFlowsManager';
 export { type DonobuStack, setupDonobuStack } from './managers/DonobuStack';
 export { InteractionVisualizer } from './managers/InteractionVisualizer';
 export { type LoadedPlugins, type PluginDependencies, PluginLoader, } from './managers/PluginLoader';

package/dist/main.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TargetRuntimePluginRegistry = exports.PersistencePluginRegistry = exports.createDefaultToolRegistry = exports.ToolManager = exports.PluginLoader = exports.InteractionVisualizer = exports.setupDonobuStack = exports.DonobuFlowsManager = exports.distillAllowedEnvVariableNames = exports.DonobuFlow = exports.env = exports.runGenerateSiteTests = exports.VercelAiGptClient = exports.OpenAiGptClient = exports.GptClientPluginRegistry = exports.GptClient = exports.GoogleGenerativeAiGptClient = exports.fixAssertFields = exports.DonobuGptClient = exports.AnthropicGptClient = void 0;
+exports.TargetRuntimePluginRegistry = exports.PersistencePluginRegistry = exports.createDefaultToolRegistry = exports.ToolManager = exports.PluginLoader = exports.InteractionVisualizer = exports.setupDonobuStack = exports.prepareToolCallsForRerun = exports.DonobuFlowsManager = exports.distillAllowedEnvVariableNames = exports.DonobuFlow = exports.env = exports.runGenerateSiteTests = exports.VercelAiGptClient = exports.OpenAiGptClient = exports.GptClientPluginRegistry = exports.GptClient = exports.GoogleGenerativeAiGptClient = exports.fixAssertFields = exports.DonobuGptClient = exports.AnthropicGptClient = void 0;
 exports.startDonobuServer = startDonobuServer;
 const commander_1 = require("commander");
 const v4_1 = require("zod/v4");
@@ -61,6 +61,7 @@ Object.defineProperty(exports, "DonobuFlow", { enumerable: true, get: function (
 var DonobuFlowsManager_1 = require("./managers/DonobuFlowsManager");
 Object.defineProperty(exports, "distillAllowedEnvVariableNames", { enumerable: true, get: function () { return DonobuFlowsManager_1.distillAllowedEnvVariableNames; } });
 Object.defineProperty(exports, "DonobuFlowsManager", { enumerable: true, get: function () { return DonobuFlowsManager_1.DonobuFlowsManager; } });
+Object.defineProperty(exports, "prepareToolCallsForRerun", { enumerable: true, get: function () { return DonobuFlowsManager_1.prepareToolCallsForRerun; } });
 var DonobuStack_1 = require("./managers/DonobuStack");
 Object.defineProperty(exports, "setupDonobuStack", { enumerable: true, get: function () { return DonobuStack_1.setupDonobuStack; } });
 var InteractionVisualizer_1 = require("./managers/InteractionVisualizer");

package/dist/managers/DonobuFlowsManager.d.ts

@@ -209,32 +209,20 @@ export declare function distillAllowedEnvVariableNames(overallObjective: string
 export declare function setupAllowedTools(flowParams: Pick<CreateDonobuFlow, 'customTools' | 'toolCallsOnStart' | 'allowedTools'>, hasGptClient: boolean, targetType: string, toolRegistry: ToolRegistry): Promise<Tool<z.ZodObject, z.ZodObject>[]>;
 /**
  * Convert an *executed* list of {@link ToolCall}s into a list of
- * {@link ProposedToolCall}s that can be replayed in a fresh browser
- * session.
+ * {@link ProposedToolCall}s that can be replayed in a fresh session.
  *
- * ### What happens?
- * 1. **Identify calls that need selector-remapping.**
- *    Some tools (e.g. {@link ClickTool}, {@link InputTextTool}) rely on a
- *    deterministic selector captured at runtime.  These tool names live in
- *    `toolsThatNeedRemappedInputs`.
- * 2. **Attempt remap with {@link ReplayableInteraction.prepareToolCallForRerun}.**
- *    If a call belongs to that set, we delegate to
- *    `ReplayableInteraction.remapForRerun` to inject the stored selector and
- *    strip any transient GPT-only fields.
- * 3. **Pass through other calls unchanged.**
- *    Tools that have no UI footprint (e.g. navigation helpers, assertions)
- *    are copied verbatim.
- * 4. **Error handling.**
- *    When remapping fails (e.g. selector metadata missing) we *skip* the
- *    offending call, emit a warning via `appLogger`, and continue processing
- *    the remainder so that a “best-effort” replay is still possible.
+ * For each call, we look up the {@link Tool} in the given registry and
+ * delegate to its `prepareForRerun` override. Tools that need selector
+ * remapping (e.g. {@link ClickTool}, {@link InputTextTool}, the mobile
+ * interaction tools) each own their own logic; tools with no replay-
+ * specific needs inherit the passthrough default from {@link Tool}.
  *
- * The resulting array preserves the original order **minus** any calls that
- * could not be remapped.
+ * When a tool is not registered (stale flow, removed tool) or
+ * `prepareForRerun` throws (e.g. missing selector metadata), the call
+ * is passed through or skipped with an `appLogger.warn` — "best-effort
+ * replay" behavior is preserved.
  *
- * @param toolCalls – The chronologically ordered list of executed
- *                   {@link ToolCall}s.
  * @returns A list of {@link ProposedToolCall}s ready for replay.
  */
-export declare function prepareToolCallsForRerun(toolCalls: ToolCall[], options: CodeGenerationOptions): Promise<ProposedToolCall[]>;
+export declare function prepareToolCallsForRerun(toolCalls: ToolCall[], options: CodeGenerationOptions, toolRegistry: ToolRegistry): Promise<ProposedToolCall[]>;
 //# sourceMappingURL=DonobuFlowsManager.d.ts.map

package/dist/managers/DonobuFlowsManager.js

@@ -51,18 +51,7 @@ const ToolRequiresGptException_1 = require("../exceptions/ToolRequiresGptExcepti
 const UnknownToolException_1 = require("../exceptions/UnknownToolException");
 const GptConfig_1 = require("../models/GptConfig");
 const resolveTargetRuntime_1 = require("../targets/resolveTargetRuntime");
-const ChooseSelectOptionTool_1 = require("../tools/ChooseSelectOptionTool");
-const ClickTool_1 = require("../tools/ClickTool");
 const CustomToolRunnerTool_1 = require("../tools/CustomToolRunnerTool");
-const DoubleClickTool_1 = require("../tools/DoubleClickTool");
-const HoverOverElementTool_1 = require("../tools/HoverOverElementTool");
-const InputFakerTool_1 = require("../tools/InputFakerTool");
-const InputRandomizedEmailAddressTool_1 = require("../tools/InputRandomizedEmailAddressTool");
-const InputTextTool_1 = require("../tools/InputTextTool");
-const PressKeyTool_1 = require("../tools/PressKeyTool");
-const RememberPageTextTool_1 = require("../tools/RememberPageTextTool");
-const ReplayableInteraction_1 = require("../tools/ReplayableInteraction");
-const ScrollPageTool_1 = require("../tools/ScrollPageTool");
 const FlowLogBuffer_1 = require("../utils/FlowLogBuffer");
 const Logger_1 = require("../utils/Logger");
 const MiscUtils_1 = require("../utils/MiscUtils");
@@ -291,11 +280,9 @@ class DonobuFlowsManager {
     async getToolCallsForRerun(priorFlowMetadata, options) {
         const originalToolCalls = await this.getToolCalls(priorFlowMetadata.id);
         // Delegate tool call preparation to the target runtime plugin so that
-        // rerun logic is fully target-agnostic.
-        const plugin = this.targetRuntimePlugins.get(priorFlowMetadata.target);
-        return plugin
-            ? await plugin.prepareToolCallsForRerun(originalToolCalls, options)
-            : await prepareToolCallsForRerun(originalToolCalls, options);
+        // rerun logic is fully target-agnostic — it dispatches per tool via
+        // the tool's own `prepareForRerun` override.
+        return prepareToolCallsForRerun(originalToolCalls, options, this.toolRegistry);
     }
     /**
      * Loads the given flow by ID and returns a `CreateDonobuFlow` object that can be passed to `createFlow`
@@ -460,7 +447,7 @@ class DonobuFlowsManager {
         const flowMetadata = await this.getFlowById(flowId);
         // Do not generate code for non-successful tool calls.
         const originalToolCalls = (await this.getToolCalls(flowId)).filter((tc) => tc.outcome?.isSuccessful);
-        const proposedToolCalls = await prepareToolCallsForRerun(originalToolCalls, effectiveOptions);
+        const proposedToolCalls = await prepareToolCallsForRerun(originalToolCalls, effectiveOptions, this.toolRegistry);
         const scriptVariant = effectiveOptions.playwrightScriptVariant === 'classic' ? 'classic' : 'ai';
         if (scriptVariant === 'classic') {
             return (0, CodeGenerator_1.getFlowAsPlaywrightScript)(flowMetadata, proposedToolCalls, effectiveOptions, this.toolRegistry);
@@ -478,9 +465,9 @@ class DonobuFlowsManager {
         const flowsWithToolCalls = await Promise.all(flowIds.map(async (flowId) => {
             const metadata = await this.getFlowById(flowId);
             const toolCalls = await this.getToolCalls(flowId);
-            // Filter out unsuccessful tool calls and prepare them for replay
+            // Filter out unsuccessful tool calls and prepare them for replay.
             const successfulToolCalls = toolCalls.filter((tc) => tc.outcome?.isSuccessful);
-            const proposedToolCalls = await prepareToolCallsForRerun(successfulToolCalls, options);
+            const proposedToolCalls = await prepareToolCallsForRerun(successfulToolCalls, options, this.toolRegistry);
             return {
                 metadata,
                 toolCalls: proposedToolCalls,
@@ -866,65 +853,40 @@ async function throwIfAnyToolsRequireGpt(requestedTools, toolCallsOnStart, toolR
 }
 /**
  * Convert an *executed* list of {@link ToolCall}s into a list of
- * {@link ProposedToolCall}s that can be replayed in a fresh browser
- * session.
+ * {@link ProposedToolCall}s that can be replayed in a fresh session.
  *
- * ### What happens?
- * 1. **Identify calls that need selector-remapping.**
- *    Some tools (e.g. {@link ClickTool}, {@link InputTextTool}) rely on a
- *    deterministic selector captured at runtime.  These tool names live in
- *    `toolsThatNeedRemappedInputs`.
- * 2. **Attempt remap with {@link ReplayableInteraction.prepareToolCallForRerun}.**
- *    If a call belongs to that set, we delegate to
- *    `ReplayableInteraction.remapForRerun` to inject the stored selector and
- *    strip any transient GPT-only fields.
- * 3. **Pass through other calls unchanged.**
- *    Tools that have no UI footprint (e.g. navigation helpers, assertions)
- *    are copied verbatim.
- * 4. **Error handling.**
- *    When remapping fails (e.g. selector metadata missing) we *skip* the
- *    offending call, emit a warning via `appLogger`, and continue processing
- *    the remainder so that a “best-effort” replay is still possible.
+ * For each call, we look up the {@link Tool} in the given registry and
+ * delegate to its `prepareForRerun` override. Tools that need selector
+ * remapping (e.g. {@link ClickTool}, {@link InputTextTool}, the mobile
+ * interaction tools) each own their own logic; tools with no replay-
+ * specific needs inherit the passthrough default from {@link Tool}.
  *
- * The resulting array preserves the original order **minus** any calls that
- * could not be remapped.
+ * When a tool is not registered (stale flow, removed tool) or
+ * `prepareForRerun` throws (e.g. missing selector metadata), the call
+ * is passed through or skipped with an `appLogger.warn` — "best-effort
+ * replay" behavior is preserved.
  *
- * @param toolCalls – The chronologically ordered list of executed
- *                   {@link ToolCall}s.
  * @returns A list of {@link ProposedToolCall}s ready for replay.
  */
-async function prepareToolCallsForRerun(toolCalls, options) {
-    // Tools that need special handling for their inputs during replay.
-    const toolsThatNeedRemappedInputs = new Set([
-        ChooseSelectOptionTool_1.ChooseSelectOptionTool.NAME,
-        ClickTool_1.ClickTool.NAME,
-        DoubleClickTool_1.DoubleClickTool.NAME,
-        HoverOverElementTool_1.HoverOverElementTool.NAME,
-        InputFakerTool_1.InputFakerTool.NAME,
-        InputRandomizedEmailAddressTool_1.InputRandomizedEmailAddressTool.NAME,
-        InputTextTool_1.InputTextTool.NAME,
-        PressKeyTool_1.PressKeyTool.NAME,
-        RememberPageTextTool_1.RememberPageTextTool.NAME,
-        ScrollPageTool_1.ScrollPageTool.NAME,
-    ]);
+async function prepareToolCallsForRerun(toolCalls, options, toolRegistry) {
+    const toolsByName = new Map(toolRegistry.allTools().map((tool) => [tool.name, tool]));
     const proposedToolCalls = [];
     for (const toolCall of toolCalls) {
-        const needsRemappedInputs = toolsThatNeedRemappedInputs.has(toolCall.toolName);
-        if (needsRemappedInputs) {
-            try {
-                proposedToolCalls.push(ReplayableInteraction_1.ReplayableInteraction.prepareToolCallForRerun(toolCall, options));
-            }
-            catch (e) {
-                // Skip.
-                Logger_1.appLogger.warn(`Failed to prepare tool call for rerun: ${JSON.stringify(toolCall)}`, e);
-            }
-        }
-        else {
-            // This is just a normal tool then.
+        const tool = toolsByName.get(toolCall.toolName);
+        if (!tool) {
+            // Tool no longer registered (e.g. stale flow referencing a removed
+            // tool). Passthrough so we don't silently drop the call.
             proposedToolCalls.push({
                 name: toolCall.toolName,
                 parameters: toolCall.parameters,
             });
+            continue;
+        }
+        try {
+            proposedToolCalls.push(tool.prepareForRerun(toolCall, options));
+        }
+        catch (e) {
+            Logger_1.appLogger.warn(`Failed to prepare tool call for rerun: ${JSON.stringify(toolCall)}`, e);
         }
     }
     return proposedToolCalls;

package/dist/targets/TargetRuntimePlugin.d.ts

@@ -4,11 +4,8 @@ import type { env } from '../envVars';
 import type { InteractionVisualizer } from '../managers/InteractionVisualizer';
 import type { BrowserStateReference } from '../models/BrowserStateFlowReference';
 import type { BrowserStorageState } from '../models/BrowserStorageState';
-import type { CodeGenerationOptions } from '../models/CodeGenerationOptions';
 import type { ControlPanelFactory } from '../models/ControlPanel';
 import type { CreateDonobuFlow } from '../models/CreateDonobuFlow';
-import type { ProposedToolCall } from '../models/ProposedToolCall';
-import type { ToolCall } from '../models/ToolCall';
 import type { TargetRuntime } from './TargetRuntime';
 /**
  * Parameters passed to {@link TargetRuntimePlugin.createRuntime}.
@@ -80,13 +77,6 @@ export interface TargetRuntimePlugin {
      * the flow completes or errors.
      */
     createRuntime(params: TargetRuntimeParams): Promise<TargetRuntime>;
-    /**
-     * Prepare tool calls from a prior flow for deterministic replay.
-     *
-     * Each target provides its own replay logic. For example, the web target
-     * uses {@link ReplayableInteraction.prepareToolCallForRerun}.
-     */
-    prepareToolCallsForRerun(toolCalls: ToolCall[], options: CodeGenerationOptions): Promise<ProposedToolCall[]>;
 }
 /**
  * An immutable registry of target runtime plugins, keyed by target type.

package/dist/targets/WebTargetRuntime.js

@@ -40,18 +40,7 @@ const path = __importStar(require("path"));
 const InvalidParamValueException_1 = require("../exceptions/InvalidParamValueException");
 const WebTargetInspector_1 = require("../managers/WebTargetInspector");
 const ControlPanel_1 = require("../models/ControlPanel");
-const ChooseSelectOptionTool_1 = require("../tools/ChooseSelectOptionTool");
-const ClickTool_1 = require("../tools/ClickTool");
-const DoubleClickTool_1 = require("../tools/DoubleClickTool");
 const GoToWebpageTool_1 = require("../tools/GoToWebpageTool");
-const HoverOverElementTool_1 = require("../tools/HoverOverElementTool");
-const InputFakerTool_1 = require("../tools/InputFakerTool");
-const InputRandomizedEmailAddressTool_1 = require("../tools/InputRandomizedEmailAddressTool");
-const InputTextTool_1 = require("../tools/InputTextTool");
-const PressKeyTool_1 = require("../tools/PressKeyTool");
-const RememberPageTextTool_1 = require("../tools/RememberPageTextTool");
-const ReplayableInteraction_1 = require("../tools/ReplayableInteraction");
-const ScrollPageTool_1 = require("../tools/ScrollPageTool");
 const BrowserUtils_1 = require("../utils/BrowserUtils");
 const Logger_1 = require("../utils/Logger");
 const PlaywrightUtils_1 = require("../utils/PlaywrightUtils");
@@ -263,37 +252,5 @@ exports.webTargetRuntimePlugin = {
     async createRuntime(params) {
         return WebTargetRuntime.create(params);
     },
-    async prepareToolCallsForRerun(toolCalls, options) {
-        const toolsThatNeedRemappedInputs = new Set([
-            ChooseSelectOptionTool_1.ChooseSelectOptionTool.NAME,
-            ClickTool_1.ClickTool.NAME,
-            DoubleClickTool_1.DoubleClickTool.NAME,
-            HoverOverElementTool_1.HoverOverElementTool.NAME,
-            InputFakerTool_1.InputFakerTool.NAME,
-            InputRandomizedEmailAddressTool_1.InputRandomizedEmailAddressTool.NAME,
-            InputTextTool_1.InputTextTool.NAME,
-            PressKeyTool_1.PressKeyTool.NAME,
-            RememberPageTextTool_1.RememberPageTextTool.NAME,
-            ScrollPageTool_1.ScrollPageTool.NAME,
-        ]);
-        const proposedToolCalls = [];
-        for (const toolCall of toolCalls) {
-            if (toolsThatNeedRemappedInputs.has(toolCall.toolName)) {
-                try {
-                    proposedToolCalls.push(ReplayableInteraction_1.ReplayableInteraction.prepareToolCallForRerun(toolCall, options));
-                }
-                catch (e) {
-                    Logger_1.appLogger.warn(`Failed to prepare tool call for rerun: ${JSON.stringify(toolCall)}`, e);
-                }
-            }
-            else {
-                proposedToolCalls.push({
-                    name: toolCall.toolName,
-                    parameters: toolCall.parameters,
-                });
-            }
-        }
-        return proposedToolCalls;
-    },
 };
 //# sourceMappingURL=WebTargetRuntime.js.map

package/dist/tools/ReplayableInteraction.d.ts

@@ -180,7 +180,7 @@ export declare abstract class ReplayableInteraction<CoreSchema extends z.ZodObje
      * @returns A {@link ProposedToolCall} that can be executed in a fresh run.
      * @throws  Error if the original call lacks selector metadata.
      */
-    static prepareToolCallForRerun(toolCall: ToolCall, options: CodeGenerationOptions): ProposedToolCall;
+    prepareForRerun(toolCall: ToolCall, options: CodeGenerationOptions): ProposedToolCall;
 }
 export {};
 //# sourceMappingURL=ReplayableInteraction.d.ts.map

package/dist/tools/ReplayableInteraction.js

@@ -590,7 +590,7 @@ class ReplayableInteraction extends Tool_1.Tool {
      * @returns A {@link ProposedToolCall} that can be executed in a fresh run.
      * @throws  Error if the original call lacks selector metadata.
      */
-    static prepareToolCallForRerun(toolCall, options) {
+    prepareForRerun(toolCall, options) {
         // If the tool call is from a GPT, we need the result metadata to continue.
         if (!('selector' in toolCall.parameters)) {
             if (!toolCall.outcome.metadata) {

package/dist/tools/Tool.d.ts

@@ -1,4 +1,7 @@
 import type { z } from 'zod/v4';
+import type { CodeGenerationOptions } from '../models/CodeGenerationOptions';
+import type { ProposedToolCall } from '../models/ProposedToolCall';
+import type { ToolCall } from '../models/ToolCall';
 import type { ToolCallContext } from '../models/ToolCallContext';
 import type { ToolCallResult } from '../models/ToolCallResult';
 /** Represents a tool call to be invoked by a DonobuFlow. */
@@ -33,5 +36,16 @@ export declare abstract class Tool<CallSchema extends z.ZodObject, CallFromGptSc
      * Invoke the tool as made from a GPT with the given context and parameters.
      */
     abstract callFromGpt(context: ToolCallContext, parameters: z.infer<CallFromGptSchema>): Promise<ToolCallResult>;
+    /**
+     * Transform a completed tool call into a {@link ProposedToolCall} suitable
+     * for deterministic replay / code generation.
+     *
+     * The default implementation is a passthrough — `{ name, parameters }` —
+     * which is correct for tools that have no replay-specific logic
+     * (waits, assertions, markers, etc.). Tools that need to hoist
+     * selector metadata out of their outcome, strip LLM-only fields, or
+     * otherwise rewrite themselves override this method.
+     */
+    prepareForRerun(toolCall: ToolCall, _options: CodeGenerationOptions): ProposedToolCall;
 }
 //# sourceMappingURL=Tool.d.ts.map

package/dist/tools/Tool.js

@@ -27,6 +27,22 @@ class Tool {
         this.controlPanelMessage = controlPanelMessage;
         this.supportedTargets = supportedTargets;
     }
+    /**
+     * Transform a completed tool call into a {@link ProposedToolCall} suitable
+     * for deterministic replay / code generation.
+     *
+     * The default implementation is a passthrough — `{ name, parameters }` —
+     * which is correct for tools that have no replay-specific logic
+     * (waits, assertions, markers, etc.). Tools that need to hoist
+     * selector metadata out of their outcome, strip LLM-only fields, or
+     * otherwise rewrite themselves override this method.
+     */
+    prepareForRerun(toolCall, _options) {
+        return {
+            name: toolCall.toolName,
+            parameters: toolCall.parameters,
+        };
+    }
 }
 exports.Tool = Tool;
 //# sourceMappingURL=Tool.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "donobu",
-  "version": "5.25.5",
+  "version": "5.26.0",
   "description": "Create browser automations with an LLM agent and replay them as Playwright scripts.",
   "main": "dist/main.js",
   "module": "dist/esm/main.js",