@browserbasehq/orca 3.1.0-patch.4 → 3.2.0-middleware.2

package/dist/esm/lib/v3/v3.js

@@ -32,7 +32,6 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
-import { EventEmitter } from "events";
 import fs from "fs";
 import os from "os";
 import path from "path";
@@ -50,6 +49,7 @@ import { ExtractHandler } from "./handlers/extractHandler.js";
 import { ObserveHandler } from "./handlers/observeHandler.js";
 import { V3AgentHandler } from "./handlers/v3AgentHandler.js";
 import { V3CuaAgentHandler } from "./handlers/v3CuaAgentHandler.js";
+import { CAPTCHA_CUA_SYSTEM_PROMPT_NOTE } from "./agent/utils/captchaSolver.js";
 import { createBrowserbaseSession } from "./launch/browserbase.js";
 import { launchLocalChrome } from "./launch/local.js";
 import { LLMProvider } from "./llm/LLMProvider.js";
@@ -63,12 +63,15 @@ import { resolveModel } from "../modelUtils.js";
 import { StagehandAPIClient } from "./api.js";
 import { validateExperimentalFeatures } from "./agent/utils/validateExperimentalFeatures.js";
 import { flattenVariables } from "./agent/utils/variables.js";
-import { SessionFileLogger, logStagehandStep } from "./flowLogger.js";
+import { FlowLogger } from "./flowlogger/FlowLogger.js";
+import { EventEmitterWithWildcardSupport } from "./flowlogger/EventEmitter.js";
+import { EventStore } from "./flowlogger/EventStore.js";
 import { createTimeoutGuard } from "./handlers/handlerUtils/timeoutGuard.js";
 import { ActTimeoutError } from "./types/public/sdkErrors.js";
 const DEFAULT_MODEL_NAME = "openai/gpt-4.1-mini";
 const DEFAULT_VIEWPORT = { width: 1288, height: 711 };
-function resolveModelConfiguration(model) {
+const DEFAULT_AGENT_TOOL_TIMEOUT_MS = 45000;
+export function resolveModelConfiguration(model) {
     if (!model) {
         return { modelName: DEFAULT_MODEL_NAME };
     }
@@ -76,13 +79,14 @@ function resolveModelConfiguration(model) {
         return { modelName: model };
     }
     if (model && typeof model === "object") {
-        const { modelName, ...clientOptions } = model;
+        const { modelName, middleware, ...clientOptions } = model;
         if (!modelName) {
             throw new StagehandInvalidArgumentError("model.modelName is required when providing client options.");
         }
         return {
             modelName,
             clientOptions: clientOptions,
+            middleware,
         };
     }
     return { modelName: DEFAULT_MODEL_NAME };
@@ -110,9 +114,15 @@ let V3 = (() => {
     return class V3 {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-            _act_decorators = [logStagehandStep("Stagehand.act", "ACT")];
-            _extract_decorators = [logStagehandStep("Stagehand.extract", "EXTRACT")];
-            _observe_decorators = [logStagehandStep("Stagehand.observe", "OBSERVE")];
+            _act_decorators = [FlowLogger.wrapWithLogging({
+                    eventType: "StagehandAct",
+                })];
+            _extract_decorators = [FlowLogger.wrapWithLogging({
+                    eventType: "StagehandExtract",
+                })];
+            _observe_decorators = [FlowLogger.wrapWithLogging({
+                    eventType: "StagehandObserve",
+                })];
             __esDecorate(this, null, _act_decorators, { kind: "method", name: "act", static: false, private: false, access: { has: obj => "act" in obj, get: obj => obj.act }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _extract_decorators, { kind: "method", name: "extract", static: false, private: false, access: { has: obj => "extract" in obj, get: obj => obj.extract }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _observe_decorators, { kind: "method", name: "observe", static: false, private: false, access: { has: obj => "observe" in obj, get: obj => obj.observe }, metadata: _metadata }, null, _instanceExtraInitializers);
@@ -129,7 +139,7 @@ let V3 = (() => {
          * Event bus for internal communication.
          * Emits events like 'screenshot' when screenshots are captured during agent execution.
          */
-        bus = new EventEmitter();
+        bus = new EventEmitterWithWildcardSupport();
         modelName;
         modelClientOptions;
         llmProvider;
@@ -154,6 +164,15 @@ let V3 = (() => {
         get isBrowserbase() {
             return this.state.kind === "BROWSERBASE";
         }
+        /**
+         * Returns true if captcha auto-solving is enabled on Browserbase.
+         * Defaults to true when not explicitly set to false.
+         */
+        get isCaptchaAutoSolveEnabled() {
+            return (this.isBrowserbase &&
+                this.opts.browserbaseSessionCreateParams?.browserSettings
+                    ?.solveCaptchas !== false);
+        }
         /**
          * Returns true if advancedStealth is enabled in Browserbase settings.
          */
@@ -197,6 +216,9 @@ let V3 = (() => {
         stagehandLogger;
         _history = [];
         instanceId;
+        sessionId;
+        eventStore;
+        flowLoggerContext;
         static _processGuardsInstalled = false;
         static _instances = new Set();
         cacheStorage;
@@ -236,6 +258,7 @@ let V3 = (() => {
             this.externalLogger = opts.logger;
             this.verbose = opts.verbose ?? 1;
             this.instanceId = uuidv7();
+            this.sessionId = opts.sessionId ?? this.instanceId;
             this.keepAlive =
                 opts.keepAlive ?? opts.browserbaseSessionCreateParams?.keepAlive;
             // Create per-instance StagehandLogger (handles usePino, verbose, externalLogger)
@@ -267,11 +290,11 @@ let V3 = (() => {
             catch {
                 // ignore
             }
-            const { modelName, clientOptions } = resolveModelConfiguration(opts.model);
+            const { modelName, clientOptions, middleware } = resolveModelConfiguration(opts.model);
             this.modelName = modelName;
             this.experimental = opts.experimental ?? false;
             this.logInferenceToFile = opts.logInferenceToFile ?? false;
-            this.llmProvider = new LLMProvider(this.logger);
+            this.llmProvider = new LLMProvider(this.logger, middleware);
             this.domSettleTimeoutMs = opts.domSettleTimeout;
             this.disableAPI = opts.disableAPI ?? false;
             const baseClientOptions = clientOptions
@@ -328,8 +351,21 @@ let V3 = (() => {
                 act: this.act.bind(this),
             });
             this.opts = opts;
-            // Initialize session file logger
-            SessionFileLogger.init(this.instanceId, opts);
+            // FlowLogger always gets a per-instance session context and shared event
+            // bus. The attached EventStore decides which sinks are active:
+            // `BROWSERBASE_FLOW_LOGS=1` enables pretty stderr output,
+            // and `BROWSERBASE_CONFIG_DIR` enables the pretty/jsonl file sinks for this session.
+            this.eventStore = new EventStore(this.sessionId, opts);
+            this.flowLoggerContext = FlowLogger.init(this.sessionId, this.bus);
+            // Flow event pipeline:
+            // FlowLogger -> this.bus -> this.eventStore -> configured sinks/query history.
+            // V3 owns the bus for this session. EventStore is not another bus; it just
+            // receives already-emitted FlowEvents here, then fans them out to sinks and
+            // keeps the queryable per-session history used by /v4/log, parent/ancestor lookups, and tests.
+            // `on()` stores a strong reference to the handler, so the EventStore
+            // stays alive until this bus is garbage-collected with the rest of the V3
+            // object graph.
+            this.bus.on("*", this.eventStore.emit);
             // Track instance for global process guard handling
             V3._instances.add(this);
         }
@@ -359,15 +395,18 @@ let V3 = (() => {
             }
             let modelName;
             let clientOptions;
+            let perCallMiddleware;
             if (typeof model === "string") {
                 modelName = model;
             }
             else {
-                const { modelName: overrideModelName, ...rest } = model;
+                const { modelName: overrideModelName, middleware, ...rest } = model;
                 modelName = overrideModelName;
                 clientOptions = rest;
+                perCallMiddleware = middleware;
             }
             if (modelName === this.modelName &&
+                !perCallMiddleware &&
                 (!clientOptions || Object.keys(clientOptions).length === 0)) {
                 return this.llmClient;
             }
@@ -384,6 +423,13 @@ let V3 = (() => {
                     mergedOptions.apiKey = apiKey;
                 }
             }
+            if (perCallMiddleware) {
+                return this.llmProvider.getClient(modelName, mergedOptions, {
+                    experimental: this.experimental,
+                    disableAPI: this.disableAPI,
+                    middleware: perCallMiddleware,
+                });
+            }
             const cacheKey = JSON.stringify({
                 modelName,
                 clientOptions: mergedOptions,
@@ -392,7 +438,10 @@ let V3 = (() => {
             if (cached) {
                 return cached;
             }
-            const client = this.llmProvider.getClient(modelName, mergedOptions, { experimental: this.experimental, disableAPI: this.disableAPI });
+            const client = this.llmProvider.getClient(modelName, mergedOptions, {
+                experimental: this.experimental,
+                disableAPI: this.disableAPI,
+            });
             this.overrideLlmClients.set(cacheKey, client);
             return client;
         }
@@ -552,6 +601,13 @@ let V3 = (() => {
                             }
                         }
                         const lbo = this.opts.localBrowserLaunchOptions ?? {};
+                        if (lbo.cdpHeaders && !lbo.cdpUrl) {
+                            this.logger({
+                                category: "init",
+                                message: "`cdpHeaders` was provided but `cdpUrl` is not set — cdpHeaders will be ignored. Set `cdpUrl` to connect to an existing browser via CDP.",
+                                level: 2,
+                            });
+                        }
                         // If a CDP URL is provided, attach instead of launching.
                         if (lbo.cdpUrl) {
                             this.logger({
@@ -561,10 +617,9 @@ let V3 = (() => {
                             });
                             this.ctx = await V3Context.create(lbo.cdpUrl, {
                                 env: "LOCAL",
+                                cdpHeaders: lbo.cdpHeaders,
                             });
-                            const logCtx = SessionFileLogger.getContext();
-                            this.ctx.conn.cdpLogger = (info) => SessionFileLogger.logCdpCallEvent(info, logCtx);
-                            this.ctx.conn.cdpEventLogger = (info) => SessionFileLogger.logCdpMessageEvent(info, logCtx);
+                            this.ctx.conn.flowLoggerContext = this.flowLoggerContext;
                             this.ctx.conn.onTransportClosed(this._onCdpClosed);
                             this.state = {
                                 kind: "LOCAL",
@@ -660,9 +715,7 @@ let V3 = (() => {
                             env: "LOCAL",
                             localBrowserLaunchOptions: lbo,
                         });
-                        const logCtx = SessionFileLogger.getContext();
-                        this.ctx.conn.cdpLogger = (info) => SessionFileLogger.logCdpCallEvent(info, logCtx);
-                        this.ctx.conn.cdpEventLogger = (info) => SessionFileLogger.logCdpMessageEvent(info, logCtx);
+                        this.ctx.conn.flowLoggerContext = this.flowLoggerContext;
                         this.ctx.conn.onTransportClosed(this._onCdpClosed);
                         this.state = {
                             kind: "LOCAL",
@@ -689,9 +742,6 @@ let V3 = (() => {
                     }
                     if (this.opts.env === "BROWSERBASE") {
                         const { apiKey, projectId } = this.requireBrowserbaseCreds();
-                        if (!apiKey || !projectId) {
-                            throw new MissingEnvironmentVariableError("BROWSERBASE_API_KEY and BROWSERBASE_PROJECT_ID", "Browserbase environment");
-                        }
                         this.logger({
                             category: "init",
                             message: "Starting browserbase session",
@@ -700,9 +750,13 @@ let V3 = (() => {
                         const baseSessionParams = this.opts.browserbaseSessionCreateParams ?? {};
                         const resolvedKeepAlive = this.keepAlive;
                         const keepAlive = this.keepAlive === true;
-                        const effectiveSessionParams = resolvedKeepAlive !== undefined
-                            ? { ...baseSessionParams, keepAlive: resolvedKeepAlive }
-                            : baseSessionParams;
+                        let effectiveSessionParams = baseSessionParams;
+                        if (resolvedKeepAlive !== undefined) {
+                            effectiveSessionParams = {
+                                ...baseSessionParams,
+                                keepAlive: resolvedKeepAlive,
+                            };
+                        }
                         if (!this.disableAPI && !this.experimental) {
                             this.apiClient = new StagehandAPIClient({
                                 apiKey,
@@ -710,18 +764,20 @@ let V3 = (() => {
                                 logger: this.logger,
                                 serverCache: this.opts.serverCache,
                             });
+                            const { projectId: overrideProjectId, browserSettings, userMetadata, ...restSessionParams } = effectiveSessionParams;
+                            const resolvedProjectId = overrideProjectId ?? projectId;
                             const createSessionPayload = {
-                                projectId: effectiveSessionParams.projectId ?? projectId,
-                                ...effectiveSessionParams,
+                                ...(resolvedProjectId ? { projectId: resolvedProjectId } : {}),
+                                ...restSessionParams,
                                 browserSettings: {
-                                    ...(effectiveSessionParams.browserSettings ?? {}),
-                                    viewport: effectiveSessionParams.browserSettings?.viewport ?? {
+                                    ...(browserSettings ?? {}),
+                                    viewport: browserSettings?.viewport ?? {
                                         width: 1288,
                                         height: 711,
                                     },
                                 },
                                 userMetadata: {
-                                    ...(effectiveSessionParams.userMetadata ?? {}),
+                                    ...(userMetadata ?? {}),
                                     stagehand: "true",
                                 },
                             };
@@ -745,9 +801,7 @@ let V3 = (() => {
                             env: "BROWSERBASE",
                             apiClient: this.apiClient,
                         });
-                        const logCtx = SessionFileLogger.getContext();
-                        this.ctx.conn.cdpLogger = (info) => SessionFileLogger.logCdpCallEvent(info, logCtx);
-                        this.ctx.conn.cdpEventLogger = (info) => SessionFileLogger.logCdpMessageEvent(info, logCtx);
+                        this.ctx.conn.flowLoggerContext = this.flowLoggerContext;
                         this.ctx.conn.onTransportClosed(this._onCdpClosed);
                         this.state = { kind: "BROWSERBASE", sessionId, ws, bb };
                         this.browserbaseSessionId = sessionId;
@@ -869,10 +923,7 @@ let V3 = (() => {
                         });
                     }
                     else {
-                        const effectiveTimeoutMs = typeof options?.timeout === "number" && options.timeout > 0
-                            ? options.timeout
-                            : undefined;
-                        const ensureTimeRemaining = createTimeoutGuard(effectiveTimeoutMs, (ms) => new ActTimeoutError(ms));
+                        const ensureTimeRemaining = createTimeoutGuard(options?.timeout, (ms) => new ActTimeoutError(ms));
                         actResult = await this.actHandler.takeDeterministicAction({ ...input, selector }, v3Page, this.domSettleTimeoutMs, this.resolveLlmClient(options?.model), ensureTimeRemaining, options?.variables);
                     }
                     // history: record ObserveResult-based act call
@@ -1026,6 +1077,7 @@ let V3 = (() => {
                 const handlerParams = {
                     instruction,
                     model: options?.model,
+                    variables: options?.variables,
                     timeout: options?.timeout,
                     selector: options?.selector,
                     page: page,
@@ -1045,6 +1097,7 @@ let V3 = (() => {
                 // history: record observe call (omit page object)
                 this.addToHistory("observe", {
                     instruction,
+                    variables: options?.variables,
                     timeout: options?.timeout,
                 }, results);
                 return results;
@@ -1093,7 +1146,7 @@ let V3 = (() => {
             try {
                 // Close session file logger
                 try {
-                    await SessionFileLogger.close();
+                    await FlowLogger.close(this.flowLoggerContext);
                 }
                 catch {
                     // ignore
@@ -1129,6 +1182,12 @@ let V3 = (() => {
                 catch {
                     // ignore
                 }
+                try {
+                    await this.eventStore.destroy();
+                }
+                catch {
+                    // ignore
+                }
                 try {
                     this.bus.removeAllListeners();
                 }
@@ -1142,6 +1201,13 @@ let V3 = (() => {
                 V3._instances.delete(this);
             }
         }
+        /**
+         * Resolves the Browserbase API key from options or environment variables.
+         * Returns undefined if no key is found (does not throw).
+         */
+        get browserbaseApiKey() {
+            return this.opts.apiKey || process.env.BROWSERBASE_API_KEY;
+        }
         /** Guard: ensure Browserbase credentials exist in options. */
         requireBrowserbaseCreds() {
             let { apiKey, projectId } = this.opts;
@@ -1151,17 +1217,13 @@ let V3 = (() => {
             if (!projectId)
                 projectId =
                     process.env.BROWSERBASE_PROJECT_ID ?? process.env.BB_PROJECT_ID;
-            if (!apiKey || !projectId) {
-                const missing = [];
-                if (!apiKey)
-                    missing.push("BROWSERBASE_API_KEY");
-                if (!projectId)
-                    missing.push("BROWSERBASE_PROJECT_ID");
-                throw new MissingEnvironmentVariableError(missing.join(", "), "Browserbase");
+            if (!apiKey) {
+                throw new MissingEnvironmentVariableError("BROWSERBASE_API_KEY", "Browserbase");
             }
             // Cache resolved values back into opts for consistency
             this.opts.apiKey = apiKey;
-            this.opts.projectId = projectId;
+            if (projectId)
+                this.opts.projectId = projectId;
             // Informational log
             this.logger({
                 category: "init",
@@ -1303,10 +1365,16 @@ let V3 = (() => {
                 ? this.resolveLlmClient(options.model)
                 : this.llmClient;
             const resolvedExecutionModel = options?.executionModel ?? options?.model;
-            const handler = new V3AgentHandler(this, this.logger, agentLlmClient, resolvedExecutionModel, options?.systemPrompt, tools, options?.mode);
+            const handler = new V3AgentHandler(this, this.logger, agentLlmClient, resolvedExecutionModel, options?.systemPrompt, tools, options?.mode, this.isCaptchaAutoSolveEnabled);
             const resolvedOptions = typeof instructionOrOptions === "string"
-                ? { instruction: instructionOrOptions }
-                : instructionOrOptions;
+                ? {
+                    instruction: instructionOrOptions,
+                    toolTimeout: DEFAULT_AGENT_TOOL_TIMEOUT_MS,
+                }
+                : {
+                    ...instructionOrOptions,
+                    toolTimeout: instructionOrOptions.toolTimeout ?? DEFAULT_AGENT_TOOL_TIMEOUT_MS,
+                };
             const callbacksWithSafety = resolvedOptions.callbacks;
             if (callbacksWithSafety?.onSafetyConfirmation) {
                 throw new StagehandInvalidArgumentError('onSafetyConfirmation callback is only supported when using mode: "cua" agents.');
@@ -1386,145 +1454,59 @@ let V3 = (() => {
                     throw new CuaModelRequiredError(AVAILABLE_CUA_MODELS);
                 }
                 const agentConfigSignature = this.agentCache.buildConfigSignature(options);
-                return {
-                    execute: async (instructionOrOptions) => withInstanceLogContext(this.instanceId, async () => {
-                        validateExperimentalFeatures({
-                            isExperimental: this.experimental,
-                            agentConfig: options,
-                            executeOptions: typeof instructionOrOptions === "object"
-                                ? instructionOrOptions
-                                : null,
-                        });
-                        SessionFileLogger.logAgentTaskStarted({
-                            invocation: "Agent.execute",
-                            args: [instructionOrOptions],
-                        });
-                        const tools = options?.integrations
-                            ? await resolveTools(options.integrations, options.tools)
-                            : (options?.tools ?? {});
-                        const handler = new V3CuaAgentHandler(this, this.logger, {
-                            modelName,
-                            clientOptions,
-                            userProvidedInstructions: options.systemPrompt ??
-                                `You are a helpful assistant that can use a web browser.\nDo not ask follow up questions, the user will trust your judgement.`,
-                        }, tools);
-                        const resolvedOptions = typeof instructionOrOptions === "string"
-                            ? { instruction: instructionOrOptions }
-                            : instructionOrOptions;
-                        if (resolvedOptions.page) {
-                            const normalizedPage = await this.normalizeToV3Page(resolvedOptions.page);
-                            this.ctx.setActivePage(normalizedPage);
-                        }
-                        const instruction = resolvedOptions.instruction.trim();
-                        const sanitizedOptions = this.agentCache.sanitizeExecuteOptions(resolvedOptions);
-                        const cacheVariables = flattenVariables(resolvedOptions.variables);
-                        let cacheContext = null;
-                        if (this.agentCache.shouldAttemptCache(instruction)) {
-                            const startPage = await this.ctx.awaitActivePage();
-                            cacheContext = await this.agentCache.prepareContext({
-                                instruction,
-                                options: sanitizedOptions,
-                                configSignature: agentConfigSignature,
-                                page: startPage,
-                                variables: cacheVariables,
-                            });
-                            if (cacheContext) {
-                                const replayed = await this.agentCache.tryReplay(cacheContext);
-                                if (replayed) {
-                                    SessionFileLogger.logAgentTaskCompleted({ cacheHit: true });
-                                    return replayed;
-                                }
-                            }
-                        }
-                        let agentSteps = [];
-                        const shouldRecordLocally = !!cacheContext && (!this.apiClient || this.experimental);
-                        if (shouldRecordLocally) {
-                            this.beginAgentReplayRecording();
-                        }
-                        let result;
-                        try {
-                            if (this.apiClient && !this.experimental) {
-                                const page = await this.ctx.awaitActivePage();
-                                result = await this.apiClient.agentExecute(options, resolvedOptions, page.mainFrameId(), !!cacheContext);
-                                if (cacheContext) {
-                                    const transferredEntry = this.apiClient.consumeLatestAgentCacheEntry();
-                                    await this.agentCache.storeTransferredEntry(transferredEntry);
-                                }
-                            }
-                            else {
-                                result = await handler.execute(instructionOrOptions);
-                            }
-                            if (shouldRecordLocally) {
-                                agentSteps = this.endAgentReplayRecording();
-                            }
-                            if (shouldRecordLocally &&
-                                cacheContext &&
-                                result.success &&
-                                agentSteps.length > 0) {
-                                await this.agentCache.store(cacheContext, agentSteps, result);
-                            }
-                            return result;
-                        }
-                        catch (err) {
-                            if (shouldRecordLocally)
-                                this.discardAgentReplayRecording();
-                            throw err;
-                        }
-                        finally {
-                            if (shouldRecordLocally) {
-                                this.discardAgentReplayRecording();
-                            }
-                            SessionFileLogger.logAgentTaskCompleted();
-                        }
-                    }),
-                };
-            }
-            // Default: AISDK tools-based agent
-            const agentConfigSignature = this.agentCache.buildConfigSignature(options);
-            const isStreaming = options?.stream ?? false;
-            return {
-                execute: async (instructionOrOptions) => withInstanceLogContext(this.instanceId, async () => {
+                const execute = async (instructionOrOptions) => withInstanceLogContext(this.instanceId, async () => {
                     validateExperimentalFeatures({
                         isExperimental: this.experimental,
                         agentConfig: options,
                         executeOptions: typeof instructionOrOptions === "object"
                             ? instructionOrOptions
                             : null,
-                        isStreaming,
-                    });
-                    SessionFileLogger.logAgentTaskStarted({
-                        invocation: "Agent.execute",
-                        args: [instructionOrOptions],
                     });
-                    // Streaming mode
-                    if (isStreaming) {
-                        const { handler, resolvedOptions, cacheContext, llmClient } = await this.prepareAgentExecution(options, instructionOrOptions, agentConfigSignature);
+                    const tools = options?.integrations
+                        ? await resolveTools(options.integrations, options.tools)
+                        : (options?.tools ?? {});
+                    const handler = new V3CuaAgentHandler(this, this.logger, {
+                        modelName,
+                        clientOptions,
+                        userProvidedInstructions: (options.systemPrompt ??
+                            `You are a helpful assistant that can use a web browser.\nDo not ask follow up questions, the user will trust your judgement.`) +
+                            (this.isCaptchaAutoSolveEnabled
+                                ? CAPTCHA_CUA_SYSTEM_PROMPT_NOTE
+                                : ""),
+                    }, tools);
+                    const resolvedOptions = typeof instructionOrOptions === "string"
+                        ? {
+                            instruction: instructionOrOptions,
+                            toolTimeout: DEFAULT_AGENT_TOOL_TIMEOUT_MS,
+                        }
+                        : {
+                            ...instructionOrOptions,
+                            toolTimeout: instructionOrOptions.toolTimeout ??
+                                DEFAULT_AGENT_TOOL_TIMEOUT_MS,
+                        };
+                    if (resolvedOptions.page) {
+                        const normalizedPage = await this.normalizeToV3Page(resolvedOptions.page);
+                        this.ctx.setActivePage(normalizedPage);
+                    }
+                    const instruction = resolvedOptions.instruction.trim();
+                    const sanitizedOptions = this.agentCache.sanitizeExecuteOptions(resolvedOptions);
+                    const cacheVariables = flattenVariables(resolvedOptions.variables);
+                    let cacheContext = null;
+                    if (this.agentCache.shouldAttemptCache(instruction)) {
+                        const startPage = await this.ctx.awaitActivePage();
+                        cacheContext = await this.agentCache.prepareContext({
+                            instruction,
+                            options: sanitizedOptions,
+                            configSignature: agentConfigSignature,
+                            page: startPage,
+                            variables: cacheVariables,
+                        });
                         if (cacheContext) {
-                            const replayed = await this.agentCache.tryReplayAsStream(cacheContext, llmClient);
+                            const replayed = await this.agentCache.tryReplay(cacheContext);
                             if (replayed) {
-                                SessionFileLogger.logAgentTaskCompleted({ cacheHit: true });
                                 return replayed;
                             }
                         }
-                        const streamResult = await handler.stream(resolvedOptions);
-                        if (cacheContext) {
-                            const wrappedStream = this.agentCache.wrapStreamForCaching(cacheContext, streamResult, () => this.beginAgentReplayRecording(), () => this.endAgentReplayRecording(), () => this.discardAgentReplayRecording());
-                            // Log completion when stream is returned (stream completes asynchronously)
-                            SessionFileLogger.logAgentTaskCompleted();
-                            return wrappedStream;
-                        }
-                        // Log completion when stream is returned (stream completes asynchronously)
-                        SessionFileLogger.logAgentTaskCompleted();
-                        return streamResult;
-                    }
-                    // Non-streaming mode (default)
-                    const { handler, resolvedOptions, cacheContext, llmClient } = await this.prepareAgentExecution(options, instructionOrOptions, agentConfigSignature);
-                    if (cacheContext) {
-                        const replayed = await this.agentCache.tryReplay(cacheContext, llmClient);
-                        if (replayed) {
-                            SessionFileLogger.logAgentTaskCompleted({ cacheHit: true });
-                            return replayed;
-                        }
                     }
                     let agentSteps = [];
                     const shouldRecordLocally = !!cacheContext && (!this.apiClient || this.experimental);
@@ -1535,14 +1517,14 @@ let V3 = (() => {
                     try {
                         if (this.apiClient && !this.experimental) {
                             const page = await this.ctx.awaitActivePage();
-                            result = await this.apiClient.agentExecute(options ?? {}, resolvedOptions, page.mainFrameId(), !!cacheContext);
+                            result = await this.apiClient.agentExecute(options, resolvedOptions, page.mainFrameId(), !!cacheContext);
                             if (cacheContext) {
                                 const transferredEntry = this.apiClient.consumeLatestAgentCacheEntry();
                                 await this.agentCache.storeTransferredEntry(transferredEntry);
                             }
                         }
                         else {
-                            result = await handler.execute(resolvedOptions);
+                            result = await handler.execute(instructionOrOptions);
                         }
                         if (shouldRecordLocally) {
                             agentSteps = this.endAgentReplayRecording();
@@ -1564,9 +1546,96 @@ let V3 = (() => {
                         if (shouldRecordLocally) {
                             this.discardAgentReplayRecording();
                         }
-                        SessionFileLogger.logAgentTaskCompleted();
                     }
-                }),
+                });
+                return {
+                    execute: FlowLogger.wrapWithLogging({
+                        eventType: "AgentExecute",
+                        context: this.flowLoggerContext,
+                    })(execute),
+                };
+            }
+            // Default: AISDK tools-based agent
+            const agentConfigSignature = this.agentCache.buildConfigSignature(options);
+            const isStreaming = options?.stream ?? false;
+            const execute = async (instructionOrOptions) => withInstanceLogContext(this.instanceId, async () => {
+                validateExperimentalFeatures({
+                    isExperimental: this.experimental,
+                    agentConfig: options,
+                    executeOptions: typeof instructionOrOptions === "object"
+                        ? instructionOrOptions
+                        : null,
+                    isStreaming,
+                });
+                // Streaming mode
+                if (isStreaming) {
+                    const { handler, resolvedOptions, cacheContext, llmClient } = await this.prepareAgentExecution(options, instructionOrOptions, agentConfigSignature);
+                    if (cacheContext) {
+                        const replayed = await this.agentCache.tryReplayAsStream(cacheContext, llmClient);
+                        if (replayed) {
+                            return replayed;
+                        }
+                    }
+                    const streamResult = await handler.stream(resolvedOptions);
+                    if (cacheContext) {
+                        const wrappedStream = this.agentCache.wrapStreamForCaching(cacheContext, streamResult, () => this.beginAgentReplayRecording(), () => this.endAgentReplayRecording(), () => this.discardAgentReplayRecording());
+                        return wrappedStream;
+                    }
+                    return streamResult;
+                }
+                // Non-streaming mode (default)
+                const { handler, resolvedOptions, cacheContext, llmClient } = await this.prepareAgentExecution(options, instructionOrOptions, agentConfigSignature);
+                if (cacheContext) {
+                    const replayed = await this.agentCache.tryReplay(cacheContext, llmClient);
+                    if (replayed) {
+                        return replayed;
+                    }
+                }
+                let agentSteps = [];
+                const shouldRecordLocally = !!cacheContext && (!this.apiClient || this.experimental);
+                if (shouldRecordLocally) {
+                    this.beginAgentReplayRecording();
+                }
+                let result;
+                try {
+                    if (this.apiClient && !this.experimental) {
+                        const page = await this.ctx.awaitActivePage();
+                        result = await this.apiClient.agentExecute(options ?? {}, resolvedOptions, page.mainFrameId(), !!cacheContext);
+                        if (cacheContext) {
+                            const transferredEntry = this.apiClient.consumeLatestAgentCacheEntry();
+                            await this.agentCache.storeTransferredEntry(transferredEntry);
+                        }
+                    }
+                    else {
+                        result = await handler.execute(resolvedOptions);
+                    }
+                    if (shouldRecordLocally) {
+                        agentSteps = this.endAgentReplayRecording();
+                    }
+                    if (shouldRecordLocally &&
+                        cacheContext &&
+                        result.success &&
+                        agentSteps.length > 0) {
+                        await this.agentCache.store(cacheContext, agentSteps, result);
+                    }
+                    return result;
+                }
+                catch (err) {
+                    if (shouldRecordLocally)
+                        this.discardAgentReplayRecording();
+                    throw err;
+                }
+                finally {
+                    if (shouldRecordLocally) {
+                        this.discardAgentReplayRecording();
+                    }
+                }
+            });
+            return {
+                execute: FlowLogger.wrapWithLogging({
+                    eventType: "AgentExecute",
+                    context: this.flowLoggerContext,
+                })(execute),
             };
         }
     };