donobu 5.17.2 → 5.18.1

package/dist/esm/targets/TargetRuntimePlugin.js

@@ -1,30 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerTargetRuntimePlugin = registerTargetRuntimePlugin;
-exports.getTargetRuntimePlugin = getTargetRuntimePlugin;
-exports.getAllTargetRuntimePlugins = getAllTargetRuntimePlugins;
-// ---------------------------------------------------------------------------
-// Plugin registry — same pattern as GptClientPlugin
-// ---------------------------------------------------------------------------
-const plugins = new Map();
+exports.TargetRuntimePluginRegistry = void 0;
 /**
- * Register a target runtime plugin under its declared type. The type should
- * match the `target` field on flow creation requests so that
- * {@link resolveTargetRuntime} can discover and use it.
+ * An immutable registry of target runtime plugins, keyed by target type.
+ * Created once at startup and threaded through the application.
  */
-function registerTargetRuntimePlugin(plugin) {
-    plugins.set(plugin.type, plugin);
-}
-/**
- * Look up a registered target runtime plugin by target type.
- */
-function getTargetRuntimePlugin(type) {
-    return plugins.get(type);
-}
-/**
- * Return all registered target runtime plugins.
- */
-function getAllTargetRuntimePlugins() {
-    return Array.from(plugins.values());
+class TargetRuntimePluginRegistry {
+    constructor(plugins) {
+        this.plugins = new Map(plugins.map((p) => [p.type, p]));
+    }
+    /** Look up a registered target runtime plugin by target type. */
+    get(type) {
+        return this.plugins.get(type);
+    }
+    /** Return all registered target runtime plugins. */
+    getAll() {
+        return Array.from(this.plugins.values());
+    }
 }
+exports.TargetRuntimePluginRegistry = TargetRuntimePluginRegistry;
 //# sourceMappingURL=TargetRuntimePlugin.js.map

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

@@ -1,16 +1,14 @@
 import type { TargetRuntime } from './TargetRuntime';
-import type { TargetRuntimeParams } from './TargetRuntimePlugin';
+import type { TargetRuntimeParams, TargetRuntimePluginRegistry } from './TargetRuntimePlugin';
 /**
  * Resolve a {@link TargetRuntime} for the given flow parameters.
  *
- * Looks up the registered {@link TargetRuntimePlugin} for the flow's target
- * type, validates the target-specific parameters, and creates a live runtime.
- *
- * Built-in targets (`web`) are registered at startup. Additional
- * targets can be registered via the plugin system.
+ * Looks up the {@link TargetRuntimePlugin} in the provided registry for the
+ * flow's target type, validates the target-specific parameters, and creates
+ * a live runtime.
  *
  * @throws {@link InvalidParamValueException} if no plugin is registered for
  *   the requested target type.
  */
-export declare function resolveTargetRuntime(params: TargetRuntimeParams): Promise<TargetRuntime>;
+export declare function resolveTargetRuntime(params: TargetRuntimeParams, targetRuntimePlugins: TargetRuntimePluginRegistry): Promise<TargetRuntime>;
 //# sourceMappingURL=resolveTargetRuntime.d.ts.map

package/dist/esm/targets/resolveTargetRuntime.js

@@ -2,22 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveTargetRuntime = resolveTargetRuntime;
 const InvalidParamValueException_1 = require("../exceptions/InvalidParamValueException");
-const TargetRuntimePlugin_1 = require("./TargetRuntimePlugin");
 /**
  * Resolve a {@link TargetRuntime} for the given flow parameters.
  *
- * Looks up the registered {@link TargetRuntimePlugin} for the flow's target
- * type, validates the target-specific parameters, and creates a live runtime.
- *
- * Built-in targets (`web`) are registered at startup. Additional
- * targets can be registered via the plugin system.
+ * Looks up the {@link TargetRuntimePlugin} in the provided registry for the
+ * flow's target type, validates the target-specific parameters, and creates
+ * a live runtime.
  *
  * @throws {@link InvalidParamValueException} if no plugin is registered for
  *   the requested target type.
  */
-async function resolveTargetRuntime(params) {
+async function resolveTargetRuntime(params, targetRuntimePlugins) {
     const targetType = params.flowParams.target;
-    const plugin = (0, TargetRuntimePlugin_1.getTargetRuntimePlugin)(targetType);
+    const plugin = targetRuntimePlugins.get(targetType);
     if (!plugin) {
         throw new InvalidParamValueException_1.InvalidParamValueException('target', targetType, `no target runtime plugin is registered for '${targetType}'`);
     }

package/dist/lib/ai/PageAi.js

@@ -105,11 +105,12 @@ class PageAiRunner {
      * a narrower list.
      */
     async buildToolManager(allowedToolsByName) {
+        const registry = this.donobu.toolRegistry;
         if (allowedToolsByName.length === 0) {
-            return new ToolManager_1.ToolManager(await ToolManager_1.ToolManager.defaultTools());
+            return new ToolManager_1.ToolManager(registry.defaultTools());
         }
-        const allTools = await ToolManager_1.ToolManager.allTools();
-        const minimalToolsByName = (await ToolManager_1.ToolManager.minimalTools()).map((t) => t.name);
+        const allTools = registry.allTools();
+        const minimalToolsByName = registry.minimalTools().map((t) => t.name);
         const semifinalToolNames = new Set([
             ...allowedToolsByName,
             ...minimalToolsByName,

package/dist/lib/page/extendPage.js

@@ -31,6 +31,24 @@ const donobuTestStack_1 = require("../test/utils/donobuTestStack");
 const originalGotoRegistry_1 = require("./originalGotoRegistry");
 const SmartSelector_1 = require("./SmartSelector");
 const tbd_1 = require("./tbd");
+/**
+ * Resolve a URL against the browser context's baseURL (if set), mirroring
+ * what Playwright does internally before issuing the navigation request.
+ * This gives us the *intended* URL (before any server-side redirects).
+ */
+function resolveBaseUrl(page, url) {
+    const baseURL = page.context()._options?.baseURL;
+    // Only resolve against baseURL if the URL is relative (no scheme like https:).
+    if (baseURL && !/^[a-zA-Z][a-zA-Z\d+\-.]*:/.test(url)) {
+        try {
+            return new URL(url, baseURL).href;
+        }
+        catch {
+            return url;
+        }
+    }
+    return url;
+}
 // Donobu page extension helpers: decorate Playwright pages with Donobu behaviors and keep one
 // coherent flow (and persistence record) per browser context so new tabs share state safely.
 const PLACEHOLDER_FLOW_URL = 'https://example.com';
@@ -340,13 +358,14 @@ Use this information to return an appropriate JSON object.`,
     page.goto = async (url, options) => {
         const startedAt = new Date().getTime();
         const flowId = sharedState.donobuFlowMetadata.id;
+        const effectiveUrl = resolveBaseUrl(page, url);
         // First navigation sets the target website and records the tool call with screenshots.
         if (sharedState.donobuFlowMetadata.web?.targetWebsite === PLACEHOLDER_FLOW_URL) {
             sharedState.donobuFlowMetadata = {
                 ...sharedState.donobuFlowMetadata,
                 web: {
                     ...sharedState.donobuFlowMetadata.web,
-                    targetWebsite: url,
+                    targetWebsite: effectiveUrl,
                 },
             };
             await sharedState.persistence.setFlowMetadata(sharedState.donobuFlowMetadata);
@@ -362,18 +381,18 @@ Use this information to return an appropriate JSON object.`,
                 id: MiscUtils_1.MiscUtils.createAdHocToolCallId(),
                 toolName: GoToWebpageTool_1.GoToWebpageTool.NAME,
                 parameters: {
-                    url: url,
+                    url: effectiveUrl,
                 },
                 outcome: {
                     isSuccessful: true,
-                    forLlm: `Successfully navigated to ${url}`,
+                    forLlm: `Successfully navigated to ${effectiveUrl}`,
                     metadata: {
                         pageTitle: pageTitle,
                         resolvedUrl: page.url(),
                     },
                 },
                 postCallImageId: postCallImageId,
-                page: url,
+                page: effectiveUrl,
                 startedAt: startedAt,
                 completedAt: completedAt,
             });
@@ -390,7 +409,7 @@ Use this information to return an appropriate JSON object.`,
                     id: MiscUtils_1.MiscUtils.createAdHocToolCallId(),
                     toolName: GoToWebpageTool_1.GoToWebpageTool.NAME,
                     parameters: {
-                        url: url,
+                        url: effectiveUrl,
                     },
                     outcome: {
                         isSuccessful: false,
@@ -398,7 +417,7 @@ Use this information to return an appropriate JSON object.`,
                         metadata: null,
                     },
                     postCallImageId: postCallImageId,
-                    page: url,
+                    page: effectiveUrl,
                     startedAt: startedAt,
                     completedAt: completedAt,
                 });
@@ -489,7 +508,7 @@ async function runTool(page, toolName, toolParams, gptClient) {
         metadata: page._dnb.donobuFlowMetadata,
         toolCallId: clonedParams.toolCallId ?? MiscUtils_1.MiscUtils.createAdHocToolCallId(),
     };
-    const tools = await ToolManager_1.ToolManager.allTools();
+    const tools = page._dnb.donobuStack.toolRegistry.allTools();
     const result = await new ToolManager_1.ToolManager(tools).invokeTool(toolCallContext, toolName, clonedParams, false);
     return result;
 }

package/dist/lib/test/utils/selfHealing.js

@@ -37,7 +37,6 @@ exports.selfHeal = selfHeal;
 const fs = __importStar(require("fs"));
 const v4_1 = require("zod/v4");
 const DonobuFlowsManager_1 = require("../../../managers/DonobuFlowsManager");
-const ToolManager_1 = require("../../../managers/ToolManager");
 const CodeGenerationOptions_1 = require("../../../models/CodeGenerationOptions");
 const AnalyzePageTextTool_1 = require("../../../tools/AnalyzePageTextTool");
 const AssertPageTextTool_1 = require("../../../tools/AssertPageTextTool");
@@ -106,7 +105,7 @@ async function selfHeal(gptClient, testInfo, page) {
         testInfo.setTimeout(testInfo.timeout + selfHealTimeoutMs);
         Logger_1.appLogger.info(`Extending the test timeout ${selfHealTimeoutMs}ms for self-healing...`);
         Logger_1.appLogger.info('Attempting to self-heal by creating a new autonomous flow...');
-        const allowedTools = await buildToolList(donobuFlowMetadata);
+        const allowedTools = await buildToolList(donobuFlowMetadata, donobu.toolRegistry);
         const objectiveWhileSelfHealing = `
 Use tool calling to follow along with the intent of this Playwright test.
 The test had failed, so some parts may need to be adjusted along the way, but
@@ -267,7 +266,7 @@ to someone who is tasked with completing it as a goal.
         };
     }
 }
-async function buildToolList(donobuFlowMetadata) {
+async function buildToolList(donobuFlowMetadata, toolRegistry) {
     const baseTools = [
         AnalyzePageTextTool_1.AnalyzePageTextTool.NAME,
         AssertTool_1.AssertTool.NAME,
@@ -293,7 +292,7 @@ async function buildToolList(donobuFlowMetadata) {
         WaitTool_1.WaitTool.NAME,
     ];
     // Always allow tools from plugins.
-    const toolsFromPlugins = (await ToolManager_1.ToolManager.pluginTools()).map((t) => t.name);
+    const toolsFromPlugins = toolRegistry.pluginTools().map((t) => t.name);
     const defaultTools = new Set([
         ...(donobuFlowMetadata.allowedTools ? donobuFlowMetadata.allowedTools : []),
         ...baseTools,

package/dist/main.d.ts

@@ -2,7 +2,7 @@ export { AnthropicGptClient } from './clients/AnthropicGptClient';
 export { DonobuGptClient } from './clients/DonobuGptClient';
 export { fixAssertFields, GoogleGenerativeAiGptClient, } from './clients/GoogleGenerativeAiGptClient';
 export { GptClient } from './clients/GptClient';
-export { type GptClientPlugin, registerGptClientPlugin, } from './clients/GptClientPlugin';
+export { type GptClientPlugin, GptClientPluginRegistry, } from './clients/GptClientPlugin';
 export { OpenAiGptClient } from './clients/OpenAiGptClient';
 export { VercelAiGptClient } from './clients/VercelAiGptClient';
 export { runGenerateSiteTests } from './codegen/runGenerateSiteTests';
@@ -25,9 +25,10 @@ export { DonobuFlow } from './managers/DonobuFlow';
 export { distillAllowedEnvVariableNames, DonobuFlowsManager, } from './managers/DonobuFlowsManager';
 export { type DonobuStack, setupDonobuStack } from './managers/DonobuStack';
 export { InteractionVisualizer } from './managers/InteractionVisualizer';
-export { type PluginDependencies, PluginLoader } from './managers/PluginLoader';
+export { type LoadedPlugins, type PluginDependencies, PluginLoader, } from './managers/PluginLoader';
 export type * from './managers/TargetInspector';
 export { ToolManager } from './managers/ToolManager';
+export { createDefaultToolRegistry, type ToolRegistry, } from './managers/ToolRegistry';
 export * from './managers/WebTargetInspector';
 export * from './models/BrowserStorageState';
 export * from './models/CodeGenerationOptions';
@@ -48,9 +49,9 @@ export * from './models/ToolSchema';
 export type { VideoSegment } from './models/VideoSegment';
 export type { EnvPersistence } from './persistence/env/EnvPersistence';
 export type { FlowsPersistence } from './persistence/flows/FlowsPersistence';
-export { type PersistencePlugin, registerPersistencePlugin, } from './persistence/PersistencePlugin';
+export { type PersistencePlugin, PersistencePluginRegistry, } from './persistence/PersistencePlugin';
 export type { TargetRuntime } from './targets/TargetRuntime';
-export { registerTargetRuntimePlugin, type TargetRuntimeParams, type TargetRuntimePlugin, } from './targets/TargetRuntimePlugin';
+export { type TargetRuntimeParams, type TargetRuntimePlugin, TargetRuntimePluginRegistry, } from './targets/TargetRuntimePlugin';
 export * from './tools/ReplayableInteraction';
 export * from './tools/Tool';
 export * from './utils/createTool';

package/dist/main.js

@@ -14,18 +14,14 @@ 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.registerTargetRuntimePlugin = exports.registerPersistencePlugin = exports.ToolManager = exports.PluginLoader = exports.InteractionVisualizer = exports.setupDonobuStack = exports.DonobuFlowsManager = exports.distillAllowedEnvVariableNames = exports.DonobuFlow = exports.env = exports.runGenerateSiteTests = exports.VercelAiGptClient = exports.OpenAiGptClient = exports.registerGptClientPlugin = 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.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");
 const envVars_1 = require("./envVars");
 const init_1 = require("./init");
 const AdminApiController_1 = require("./managers/AdminApiController");
-const PluginLoader_1 = require("./managers/PluginLoader");
-const ToolManager_1 = require("./managers/ToolManager");
 const ControlPanel_1 = require("./models/ControlPanel");
-const TargetRuntimePlugin_1 = require("./targets/TargetRuntimePlugin");
-const WebTargetRuntime_1 = require("./targets/WebTargetRuntime");
 const Logger_1 = require("./utils/Logger");
 const PlaywrightUtils_1 = require("./utils/PlaywrightUtils");
 var AnthropicGptClient_1 = require("./clients/AnthropicGptClient");
@@ -38,7 +34,7 @@ Object.defineProperty(exports, "GoogleGenerativeAiGptClient", { enumerable: true
 var GptClient_1 = require("./clients/GptClient");
 Object.defineProperty(exports, "GptClient", { enumerable: true, get: function () { return GptClient_1.GptClient; } });
 var GptClientPlugin_1 = require("./clients/GptClientPlugin");
-Object.defineProperty(exports, "registerGptClientPlugin", { enumerable: true, get: function () { return GptClientPlugin_1.registerGptClientPlugin; } });
+Object.defineProperty(exports, "GptClientPluginRegistry", { enumerable: true, get: function () { return GptClientPlugin_1.GptClientPluginRegistry; } });
 var OpenAiGptClient_1 = require("./clients/OpenAiGptClient");
 Object.defineProperty(exports, "OpenAiGptClient", { enumerable: true, get: function () { return OpenAiGptClient_1.OpenAiGptClient; } });
 var VercelAiGptClient_1 = require("./clients/VercelAiGptClient");
@@ -69,10 +65,12 @@ var DonobuStack_1 = require("./managers/DonobuStack");
 Object.defineProperty(exports, "setupDonobuStack", { enumerable: true, get: function () { return DonobuStack_1.setupDonobuStack; } });
 var InteractionVisualizer_1 = require("./managers/InteractionVisualizer");
 Object.defineProperty(exports, "InteractionVisualizer", { enumerable: true, get: function () { return InteractionVisualizer_1.InteractionVisualizer; } });
-var PluginLoader_2 = require("./managers/PluginLoader");
-Object.defineProperty(exports, "PluginLoader", { enumerable: true, get: function () { return PluginLoader_2.PluginLoader; } });
-var ToolManager_2 = require("./managers/ToolManager");
-Object.defineProperty(exports, "ToolManager", { enumerable: true, get: function () { return ToolManager_2.ToolManager; } });
+var PluginLoader_1 = require("./managers/PluginLoader");
+Object.defineProperty(exports, "PluginLoader", { enumerable: true, get: function () { return PluginLoader_1.PluginLoader; } });
+var ToolManager_1 = require("./managers/ToolManager");
+Object.defineProperty(exports, "ToolManager", { enumerable: true, get: function () { return ToolManager_1.ToolManager; } });
+var ToolRegistry_1 = require("./managers/ToolRegistry");
+Object.defineProperty(exports, "createDefaultToolRegistry", { enumerable: true, get: function () { return ToolRegistry_1.createDefaultToolRegistry; } });
 __exportStar(require("./managers/WebTargetInspector"), exports);
 __exportStar(require("./models/BrowserStorageState"), exports);
 __exportStar(require("./models/CodeGenerationOptions"), exports);
@@ -85,9 +83,9 @@ __exportStar(require("./models/TargetConfig"), exports);
 __exportStar(require("./models/ToolCallResult"), exports);
 __exportStar(require("./models/ToolSchema"), exports);
 var PersistencePlugin_1 = require("./persistence/PersistencePlugin");
-Object.defineProperty(exports, "registerPersistencePlugin", { enumerable: true, get: function () { return PersistencePlugin_1.registerPersistencePlugin; } });
-var TargetRuntimePlugin_2 = require("./targets/TargetRuntimePlugin");
-Object.defineProperty(exports, "registerTargetRuntimePlugin", { enumerable: true, get: function () { return TargetRuntimePlugin_2.registerTargetRuntimePlugin; } });
+Object.defineProperty(exports, "PersistencePluginRegistry", { enumerable: true, get: function () { return PersistencePlugin_1.PersistencePluginRegistry; } });
+var TargetRuntimePlugin_1 = require("./targets/TargetRuntimePlugin");
+Object.defineProperty(exports, "TargetRuntimePluginRegistry", { enumerable: true, get: function () { return TargetRuntimePlugin_1.TargetRuntimePluginRegistry; } });
 __exportStar(require("./tools/ReplayableInteraction"), exports);
 __exportStar(require("./tools/Tool"), exports);
 __exportStar(require("./utils/createTool"), exports);
@@ -104,17 +102,6 @@ const DEFAULT_PORT = 31000;
  */
 async function startDonobuServer({ port = DEFAULT_PORT, controlPanelHost = ControlPanel_1.NoOpControlPanelFactory, } = {}) {
     try {
-        // Register built-in target runtime plugins before external plugins,
-        // so that external plugins can override them if needed.
-        (0, TargetRuntimePlugin_1.registerTargetRuntimePlugin)(WebTargetRuntime_1.webTargetRuntimePlugin);
-        // Load all plugins (tools + persistence + target runtimes) in a single
-        // directory scan. Persistence plugins must be registered before
-        // setupDonobuStack() runs (which happens inside AdminApiController.create
-        // below).
-        const pluginLoader = await PluginLoader_1.PluginLoader.create();
-        const { tools } = await pluginLoader.loadAllPlugins();
-        ToolManager_1.ToolManager.setPluginTools(tools);
-        void (await ToolManager_1.ToolManager.allTools());
         const adminController = await AdminApiController_1.AdminApiController.create(envVars_1.env.data.DONOBU_DEPLOYMENT_ENVIRONMENT ?? 'LOCAL', controlPanelHost, envVars_1.env);
         adminController.start(port);
         Logger_1.appLogger.info(`Donobu API server available on http://localhost:${port}`);

package/dist/managers/AdminApiController.js

@@ -233,13 +233,13 @@ class AdminApiController {
             gptConfigsApi: new GptConfigsApi_1.GptConfigsApi(donobuStack.gptConfigsManager, donobuStack.agentsManager),
             agentsApi: new AgentsApi_1.AgentsApi(donobuStack.agentsManager),
             askAiApi: new AskAiApi_1.AskAiApi(donobuStack.gptClientFactory, donobuStack.gptConfigsManager, donobuStack.agentsManager),
-            toolsApi: new ToolsApi_1.ToolsApi(),
+            toolsApi: new ToolsApi_1.ToolsApi(donobuStack.toolRegistry),
             flowsApi: new FlowsApi_1.FlowsApi(donobuStack.flowsManager),
             flowsFilesApi: new FlowsFilesApi_1.FlowsFilesApi(donobuStack.flowsPersistenceRegistry),
             flowsToolCallsApi: new FlowsToolCallsApi_1.FlowsToolCallsApi(donobuStack.flowsManager),
             pingApi: new PingApi_1.PingApi(),
             schemaApi: new SchemaApi_1.SchemaApi(),
-            targetsApi: new TargetsApi_1.TargetsApi(),
+            targetsApi: new TargetsApi_1.TargetsApi(donobuStack.targetRuntimePlugins),
         };
     }
     /**

package/dist/managers/DonobuFlowsManager.d.ts

@@ -1,5 +1,6 @@
 import type { EnvPick } from 'env-struct';
 import type { BrowserContext } from 'playwright';
+import type { z } from 'zod/v4';
 import type { GptClient } from '../clients/GptClient';
 import type { GptClientFactory } from '../clients/GptClientFactory';
 import type { GeneratedProject } from '../codegen/CodeGenerator';
@@ -18,11 +19,14 @@ import type { PaginatedResult } from '../models/PaginatedResult';
 import type { ProposedToolCall } from '../models/ProposedToolCall';
 import type { ToolCall } from '../models/ToolCall';
 import type { FlowsPersistenceRegistry } from '../persistence/flows/FlowsPersistenceRegistry';
+import type { TargetRuntimePluginRegistry } from '../targets/TargetRuntimePlugin';
+import type { Tool } from '../tools/Tool';
 import type { FlowLogSnapshot } from '../utils/FlowLogBuffer';
 import type { AgentsManager } from './AgentsManager';
 import { DonobuFlow } from './DonobuFlow';
 import type { EnvDataManager } from './EnvDataManager';
 import type { GptConfigsManager } from './GptConfigsManager';
+import type { ToolRegistry } from './ToolRegistry';
 /**
  * Response wrapper for `createFlow` calls.
  */
@@ -36,14 +40,15 @@ export declare class DonobuFlowsManager {
     private readonly envDataManager;
     private readonly controlPanelFactory;
     private readonly environ;
+    private readonly toolRegistry;
+    private readonly targetRuntimePlugins;
     static readonly DEFAULT_MESSAGE_DURATION = 2247;
     static readonly DEFAULT_MAX_TOOL_CALLS = 50;
     static readonly DEFAULT_BROWSER_STATE_FILENAME = "browserstate.json";
     static readonly FLOW_NAME_MAX_LENGTH = 255;
     private readonly flowRuntime;
     private readonly flowCatalog;
-    private readonly flowDependencyResolver;
-    constructor(deploymentEnvironment: DonobuDeploymentEnvironment, gptClientFactory: GptClientFactory, gptConfigsManager: GptConfigsManager, agentsManager: AgentsManager, flowsPersistenceRegistry: FlowsPersistenceRegistry, envDataManager: EnvDataManager, controlPanelFactory: ControlPanelFactory, environ: EnvPick<typeof env, 'ANTHROPIC_API_KEY' | 'ANTHROPIC_MODEL_NAME' | 'AWS_ACCESS_KEY_ID' | 'AWS_BEDROCK_MODEL_NAME' | 'AWS_SECRET_ACCESS_KEY' | 'BASE64_GPT_CONFIG' | 'BROWSERBASE_API_KEY' | 'BROWSERBASE_PROJECT_ID' | 'DONOBU_API_KEY' | 'GOOGLE_GENERATIVE_AI_API_KEY' | 'GOOGLE_GENERATIVE_AI_MODEL_NAME' | 'OPENAI_API_KEY' | 'OPENAI_API_MODEL_NAME'>);
+    constructor(deploymentEnvironment: DonobuDeploymentEnvironment, gptClientFactory: GptClientFactory, gptConfigsManager: GptConfigsManager, agentsManager: AgentsManager, flowsPersistenceRegistry: FlowsPersistenceRegistry, envDataManager: EnvDataManager, controlPanelFactory: ControlPanelFactory, environ: EnvPick<typeof env, 'ANTHROPIC_API_KEY' | 'ANTHROPIC_MODEL_NAME' | 'AWS_ACCESS_KEY_ID' | 'AWS_BEDROCK_MODEL_NAME' | 'AWS_SECRET_ACCESS_KEY' | 'BASE64_GPT_CONFIG' | 'BROWSERBASE_API_KEY' | 'BROWSERBASE_PROJECT_ID' | 'DONOBU_API_KEY' | 'GOOGLE_GENERATIVE_AI_API_KEY' | 'GOOGLE_GENERATIVE_AI_MODEL_NAME' | 'OPENAI_API_KEY' | 'OPENAI_API_MODEL_NAME'>, toolRegistry: ToolRegistry, targetRuntimePlugins: TargetRuntimePluginRegistry);
     /**
      * Create a flow with the given parameters and invoke its `DonobuFlow#run`
      * method, adding it to list of active flows.
@@ -166,6 +171,21 @@ export declare class DonobuFlowsManager {
  * );
  */
 export declare function distillAllowedEnvVariableNames(overallObjective: string | null | undefined, explicitlyAllowedEnvVariableNames: string[] | null | undefined): string[];
+/**
+ * Resolves the final set of tools a flow is permitted to use.
+ *
+ * The resolution follows this priority:
+ * 1. If the caller explicitly listed tools, use those (filtered to the target).
+ * 2. Otherwise, fall back to target-appropriate defaults (curated subset for
+ *    web, all target-compatible tools for plugin-provided targets).
+ * 3. Tools required by `toolCallsOnStart` are always included.
+ * 4. Custom (user-defined) tools are prepended.
+ * 5. GPT-requiring tools are stripped when no GPT client is available.
+ * 6. Minimal tools (objective bookkeeping) are guaranteed present.
+ * 7. The result is deduplicated and sorted by name.
+ */
+/** @internal Exported for testing. */
+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

package/dist/managers/DonobuFlowsManager.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DonobuFlowsManager = void 0;
 exports.distillAllowedEnvVariableNames = distillAllowedEnvVariableNames;
+exports.setupAllowedTools = setupAllowedTools;
 exports.prepareToolCallsForRerun = prepareToolCallsForRerun;
 const crypto_1 = require("crypto");
 const fs = __importStar(require("fs/promises"));
@@ -50,7 +51,6 @@ 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 TargetRuntimePlugin_1 = require("../targets/TargetRuntimePlugin");
 const ChooseSelectOptionTool_1 = require("../tools/ChooseSelectOptionTool");
 const ClickTool_1 = require("../tools/ClickTool");
 const CustomToolRunnerTool_1 = require("../tools/CustomToolRunnerTool");
@@ -69,12 +69,11 @@ const MiscUtils_1 = require("../utils/MiscUtils");
 const TemplateInterpolator_1 = require("../utils/TemplateInterpolator");
 const DonobuFlow_1 = require("./DonobuFlow");
 const FlowCatalog_1 = require("./FlowCatalog");
-const FlowDependencyResolver_1 = require("./FlowDependencyResolver");
 const FlowRuntime_1 = require("./FlowRuntime");
 const InteractionVisualizer_1 = require("./InteractionVisualizer");
 const ToolManager_1 = require("./ToolManager");
 class DonobuFlowsManager {
-    constructor(deploymentEnvironment, gptClientFactory, gptConfigsManager, agentsManager, flowsPersistenceRegistry, envDataManager, controlPanelFactory, environ) {
+    constructor(deploymentEnvironment, gptClientFactory, gptConfigsManager, agentsManager, flowsPersistenceRegistry, envDataManager, controlPanelFactory, environ, toolRegistry, targetRuntimePlugins) {
         this.deploymentEnvironment = deploymentEnvironment;
         this.gptClientFactory = gptClientFactory;
         this.gptConfigsManager = gptConfigsManager;
@@ -83,9 +82,10 @@ class DonobuFlowsManager {
         this.envDataManager = envDataManager;
         this.controlPanelFactory = controlPanelFactory;
         this.environ = environ;
+        this.toolRegistry = toolRegistry;
+        this.targetRuntimePlugins = targetRuntimePlugins;
         this.flowRuntime = new FlowRuntime_1.FlowRuntime();
         this.flowCatalog = new FlowCatalog_1.FlowCatalog(this.flowsPersistenceRegistry, this.flowRuntime, this.deploymentEnvironment);
-        this.flowDependencyResolver = new FlowDependencyResolver_1.FlowDependencyResolver(this.flowCatalog);
     }
     /**
      * Create a flow with the given parameters and invoke its `DonobuFlow#run`
@@ -124,7 +124,7 @@ class DonobuFlowsManager {
             const initialRunMode = flowParams.initialRunMode ??
                 (gptClientData.gptClient ? 'AUTONOMOUS' : 'INSTRUCT');
             // --- Generic validation (target-agnostic) ---
-            await validateFlowParams(flowParams, gptClientData.gptClient, initialRunMode);
+            await validateFlowParams(flowParams, gptClientData.gptClient, initialRunMode, this.toolRegistry);
             const messageDuration = flowParams.defaultMessageDuration ??
                 DonobuFlowsManager.DEFAULT_MESSAGE_DURATION;
             const interactionVisualizer = new InteractionVisualizer_1.InteractionVisualizer(messageDuration);
@@ -137,9 +137,9 @@ class DonobuFlowsManager {
                 environ: this.environ,
                 browserContextOverride,
                 getBrowserStorageState: (ref) => this.getBrowserStorageState(ref),
-            });
+            }, this.targetRuntimePlugins);
             try {
-                const allowedTools = await setupAllowedTools(flowParams, gptClientData !== null, targetRuntime.targetType);
+                const allowedTools = await setupAllowedTools(flowParams, gptClientData !== null, targetRuntime.targetType, this.toolRegistry);
                 const toolManager = new ToolManager_1.ToolManager(allowedTools);
                 const toolCallsOnStart = flowParams.toolCallsOnStart?.length
                     ? flowParams.toolCallsOnStart
@@ -285,7 +285,7 @@ class DonobuFlowsManager {
         const originalToolCalls = await this.getToolCalls(flowId);
         // Delegate tool call preparation to the target runtime plugin so that
         // rerun logic is fully target-agnostic.
-        const plugin = (0, TargetRuntimePlugin_1.getTargetRuntimePlugin)(priorFlowMetadata.target);
+        const plugin = this.targetRuntimePlugins.get(priorFlowMetadata.target);
         const toolCallsOnStart = plugin
             ? await plugin.prepareToolCallsForRerun(originalToolCalls, options)
             : await prepareToolCallsForRerun(originalToolCalls, options);
@@ -323,7 +323,7 @@ class DonobuFlowsManager {
         if (!activeFlowHandle) {
             throw new ActiveFlowNotFoundException_1.ActiveFlowNotFoundException(flowId);
         }
-        const tool = (await ToolManager_1.ToolManager.allTools()).find((t) => t.name === toolName);
+        const tool = this.toolRegistry.allTools().find((t) => t.name === toolName);
         if (!tool) {
             throw new UnknownToolException_1.UnknownToolException(toolName);
         }
@@ -425,9 +425,9 @@ class DonobuFlowsManager {
         const proposedToolCalls = await prepareToolCallsForRerun(originalToolCalls, effectiveOptions);
         const scriptVariant = effectiveOptions.playwrightScriptVariant === 'classic' ? 'classic' : 'ai';
         if (scriptVariant === 'classic') {
-            return (0, CodeGenerator_1.getFlowAsPlaywrightScript)(flowMetadata, proposedToolCalls, effectiveOptions);
+            return (0, CodeGenerator_1.getFlowAsPlaywrightScript)(flowMetadata, proposedToolCalls, effectiveOptions, this.toolRegistry);
         }
-        return (0, CodeGenerator_1.getFlowAsAiPlaywrightScript)(flowMetadata, proposedToolCalls, effectiveOptions);
+        return (0, CodeGenerator_1.getFlowAsAiPlaywrightScript)(flowMetadata, proposedToolCalls, effectiveOptions, this.toolRegistry);
     }
     /**
      * Generates a complete Playwright project structure for multiple flows with dependency management.
@@ -473,7 +473,7 @@ class DonobuFlowsManager {
         catch (error) {
             Logger_1.appLogger.warn('Error while resolving default GPT client configuration when generating project code', error);
         }
-        return await (0, CodeGenerator_1.generateProject)(flowsWithToolCalls, resolvedBrowserStates, defaultGptConfig, options);
+        return await (0, CodeGenerator_1.generateProject)(flowsWithToolCalls, resolvedBrowserStates, defaultGptConfig, options, this.toolRegistry);
     }
     /**
      * Resolves a GPT client using the provided GPT configuration name, falling back
@@ -664,7 +664,7 @@ function validateFlowName(flowName) {
         throw new InvalidParamValueException_1.InvalidParamValueException('name', flowName, `the value cannot be longer than ${DonobuFlowsManager.FLOW_NAME_MAX_LENGTH} characters`);
     }
 }
-async function validateFlowParams(flowParams, gptClient, initialRunMode) {
+async function validateFlowParams(flowParams, gptClient, initialRunMode, toolRegistry) {
     // Target-specific validation (e.g. targetWebsite URL format) is handled
     // by the TargetRuntimePlugin.validate() call in resolveTargetRuntime().
     // This function only validates target-agnostic parameters.
@@ -695,13 +695,27 @@ async function validateFlowParams(flowParams, gptClient, initialRunMode) {
             throw new InvalidParamValueException_1.InvalidParamValueException('initialRunMode', initialRunMode);
     }
     if (!gptClient) {
-        await throwIfAnyToolsRequireGpt(flowParams.allowedTools ?? null, flowParams.toolCallsOnStart ?? null);
+        await throwIfAnyToolsRequireGpt(flowParams.allowedTools ?? null, flowParams.toolCallsOnStart ?? null, toolRegistry);
     }
 }
-async function setupAllowedTools(flowParams, hasGptClient, targetType) {
+/**
+ * Resolves the final set of tools a flow is permitted to use.
+ *
+ * The resolution follows this priority:
+ * 1. If the caller explicitly listed tools, use those (filtered to the target).
+ * 2. Otherwise, fall back to target-appropriate defaults (curated subset for
+ *    web, all target-compatible tools for plugin-provided targets).
+ * 3. Tools required by `toolCallsOnStart` are always included.
+ * 4. Custom (user-defined) tools are prepended.
+ * 5. GPT-requiring tools are stripped when no GPT client is available.
+ * 6. Minimal tools (objective bookkeeping) are guaranteed present.
+ * 7. The result is deduplicated and sorted by name.
+ */
+/** @internal Exported for testing. */
+async function setupAllowedTools(flowParams, hasGptClient, targetType, toolRegistry) {
     const customTools = flowParams.customTools?.map((tool) => new CustomToolRunnerTool_1.CustomToolRunnerTool(tool)) ?? [];
     const toolsNeededOnStart = flowParams.toolCallsOnStart?.map((t) => t.name) ?? [];
-    const targetCompatibleTools = await ToolManager_1.ToolManager.toolsForTarget(targetType);
+    const targetCompatibleTools = toolRegistry.toolsForTarget(targetType);
     let prepackagedTools;
     if (flowParams.allowedTools?.length) {
         const allowedTools = [...toolsNeededOnStart, ...flowParams.allowedTools];
@@ -714,7 +728,7 @@ async function setupAllowedTools(flowParams, hasGptClient, targetType) {
         // Web uses a curated default subset; other targets (provided by plugins)
         // default to all target-compatible tools.
         const defaultTools = targetType === 'web'
-            ? await ToolManager_1.ToolManager.defaultTools()
+            ? toolRegistry.defaultTools()
             : targetCompatibleTools;
         const allowedTools = [
             ...toolsNeededOnStart,
@@ -726,7 +740,7 @@ async function setupAllowedTools(flowParams, hasGptClient, targetType) {
     const prepackagedToolsWithGptFiltered = prepackagedTools.filter((tool) => {
         return hasGptClient || !tool.requiresGpt;
     });
-    const minimalTools = await ToolManager_1.ToolManager.minimalTools();
+    const minimalTools = toolRegistry.minimalTools();
     const existingToolNames = new Set([...customTools, ...prepackagedToolsWithGptFiltered].map((tool) => tool.name));
     const missingMinimalTools = minimalTools.filter((tool) => !existingToolNames.has(tool.name));
     const combinedTools = [
@@ -775,8 +789,8 @@ async function setFlowVideo(flowId, flowTempDir, flowsPersistence) {
         await flowsPersistence.setVideo(flowId, videoBytes);
     }
 }
-async function throwIfAnyToolsRequireGpt(requestedTools, toolCallsOnStart) {
-    const toolMap = new Map((await ToolManager_1.ToolManager.allTools()).map((tool) => [tool.name, tool]));
+async function throwIfAnyToolsRequireGpt(requestedTools, toolCallsOnStart, toolRegistry) {
+    const toolMap = new Map(toolRegistry.allTools().map((tool) => [tool.name, tool]));
     const requestedToolsRequiringGpt = [...(requestedTools ?? [])].filter((name) => toolMap.get(name)?.requiresGpt);
     if (requestedToolsRequiringGpt.length) {
         throw new ToolRequiresGptException_1.ToolRequiresGptException(requestedToolsRequiringGpt[0]);

package/dist/managers/DonobuStack.d.ts

@@ -5,11 +5,15 @@ import type { AgentsPersistence } from '../persistence/agents/AgentsPersistence'
 import type { EnvPersistenceVolatile } from '../persistence/env/EnvPersistenceVolatile';
 import { type FlowsPersistenceRegistry } from '../persistence/flows/FlowsPersistenceRegistry';
 import type { GptConfigsPersistence } from '../persistence/gptconfigs/GptConfigsPersistence';
+import { TargetRuntimePluginRegistry } from '../targets/TargetRuntimePlugin';
 import { AgentsManager } from './AgentsManager';
 import { DonobuFlowsManager } from './DonobuFlowsManager';
 import { EnvDataManager } from './EnvDataManager';
 import { GptConfigsManager } from './GptConfigsManager';
+import type { ToolRegistry } from './ToolRegistry';
 export type DonobuStack = {
+    toolRegistry: ToolRegistry;
+    targetRuntimePlugins: TargetRuntimePluginRegistry;
     gptClientFactory: GptClientFactory;
     gptConfigsPersistence: GptConfigsPersistence;
     gptConfigsManager: GptConfigsManager;