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

package/dist/cjs/lib/v3/v3.js

@@ -103,10 +103,12 @@ const api_js_1 = require("./api.js");
 const validateExperimentalFeatures_js_1 = require("./agent/utils/validateExperimentalFeatures.js");
 const variables_js_1 = require("./agent/utils/variables.js");
 const flowLogger_js_1 = require("./flowLogger.js");
+const eventStore_js_1 = require("./eventStore.js");
 const timeoutGuard_js_1 = require("./handlers/handlerUtils/timeoutGuard.js");
 const sdkErrors_js_1 = require("./types/public/sdkErrors.js");
 const DEFAULT_MODEL_NAME = "openai/gpt-4.1-mini";
 const DEFAULT_VIEWPORT = { width: 1288, height: 711 };
+const DEFAULT_AGENT_TOOL_TIMEOUT_MS = 45000;
 function resolveModelConfiguration(model) {
     if (!model) {
         return { modelName: DEFAULT_MODEL_NAME };
@@ -149,9 +151,18 @@ let V3 = (() => {
     return class V3 {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-            _act_decorators = [(0, flowLogger_js_1.logStagehandStep)("Stagehand.act", "ACT")];
-            _extract_decorators = [(0, flowLogger_js_1.logStagehandStep)("Stagehand.extract", "EXTRACT")];
-            _observe_decorators = [(0, flowLogger_js_1.logStagehandStep)("Stagehand.observe", "OBSERVE")];
+            _act_decorators = [flowLogger_js_1.FlowLogger.wrapWithLogging({
+                    eventType: "StagehandAct",
+                    eventIdSuffix: "4",
+                })];
+            _extract_decorators = [flowLogger_js_1.FlowLogger.wrapWithLogging({
+                    eventType: "StagehandExtract",
+                    eventIdSuffix: "4",
+                })];
+            _observe_decorators = [flowLogger_js_1.FlowLogger.wrapWithLogging({
+                    eventType: "StagehandObserve",
+                    eventIdSuffix: "4",
+                })];
             __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);
@@ -236,6 +247,8 @@ let V3 = (() => {
         stagehandLogger;
         _history = [];
         instanceId;
+        sessionId;
+        flowLoggerContext;
         static _processGuardsInstalled = false;
         static _instances = new Set();
         cacheStorage;
@@ -244,6 +257,10 @@ let V3 = (() => {
         apiClient = null;
         keepAlive;
         shutdownSupervisor = null;
+        detachEventStoreListener = null;
+        withLoggingContext(fn) {
+            return (0, logger_js_2.withInstanceLogContext)(this.instanceId, fn);
+        }
         stagehandMetrics = {
             actPromptTokens: 0,
             actCompletionTokens: 0,
@@ -275,6 +292,7 @@ let V3 = (() => {
             this.externalLogger = opts.logger;
             this.verbose = opts.verbose ?? 1;
             this.instanceId = (0, uuid_1.v7)();
+            this.sessionId = opts.sessionId ?? this.instanceId;
             this.keepAlive =
                 opts.keepAlive ?? opts.browserbaseSessionCreateParams?.keepAlive;
             // Create per-instance StagehandLogger (handles usePino, verbose, externalLogger)
@@ -367,8 +385,9 @@ let V3 = (() => {
                 act: this.act.bind(this),
             });
             this.opts = opts;
-            // Initialize session file logger
-            flowLogger_js_1.SessionFileLogger.init(this.instanceId, opts);
+            void (0, eventStore_js_1.getEventStore)().initializeSession(this.sessionId, opts);
+            this.flowLoggerContext = flowLogger_js_1.FlowLogger.init(this.sessionId, this.bus);
+            this.detachEventStoreListener = (0, eventStore_js_1.getEventStore)().attachBus(this.sessionId, this.bus);
             // Track instance for global process guard handling
             V3._instances.add(this);
         }
@@ -575,7 +594,7 @@ let V3 = (() => {
          */
         async init() {
             try {
-                return await (0, logger_js_2.withInstanceLogContext)(this.instanceId, async () => {
+                return await this.withLoggingContext(async () => {
                     this.actHandler = new actHandler_js_1.ActHandler(this.llmClient, this.modelName, this.modelClientOptions, (model) => this.resolveLlmClient(model), this.opts.systemPrompt ?? "", this.logInferenceToFile, this.opts.selfHeal ?? true, (functionName, promptTokens, completionTokens, reasoningTokens, cachedInputTokens, inferenceTimeMs) => this.updateMetrics(functionName, promptTokens, completionTokens, reasoningTokens, cachedInputTokens, inferenceTimeMs), this.domSettleTimeoutMs);
                     this.extractHandler = new extractHandler_js_1.ExtractHandler(this.llmClient, this.modelName, this.modelClientOptions, (model) => this.resolveLlmClient(model), this.opts.systemPrompt ?? "", this.logInferenceToFile, this.experimental, (functionName, promptTokens, completionTokens, reasoningTokens, cachedInputTokens, inferenceTimeMs) => this.updateMetrics(functionName, promptTokens, completionTokens, reasoningTokens, cachedInputTokens, inferenceTimeMs));
                     this.observeHandler = new observeHandler_js_1.ObserveHandler(this.llmClient, this.modelName, this.modelClientOptions, (model) => this.resolveLlmClient(model), this.opts.systemPrompt ?? "", this.logInferenceToFile, this.experimental, (functionName, promptTokens, completionTokens, reasoningTokens, cachedInputTokens, inferenceTimeMs) => this.updateMetrics(functionName, promptTokens, completionTokens, reasoningTokens, cachedInputTokens, inferenceTimeMs));
@@ -591,6 +610,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({
@@ -600,10 +626,9 @@ let V3 = (() => {
                             });
                             this.ctx = await context_js_1.V3Context.create(lbo.cdpUrl, {
                                 env: "LOCAL",
+                                cdpHeaders: lbo.cdpHeaders,
                             });
-                            const logCtx = flowLogger_js_1.SessionFileLogger.getContext();
-                            this.ctx.conn.cdpLogger = (info) => flowLogger_js_1.SessionFileLogger.logCdpCallEvent(info, logCtx);
-                            this.ctx.conn.cdpEventLogger = (info) => flowLogger_js_1.SessionFileLogger.logCdpMessageEvent(info, logCtx);
+                            this.ctx.conn.flowLoggerContext = this.flowLoggerContext;
                             this.ctx.conn.onTransportClosed(this._onCdpClosed);
                             this.state = {
                                 kind: "LOCAL",
@@ -699,9 +724,7 @@ let V3 = (() => {
                             env: "LOCAL",
                             localBrowserLaunchOptions: lbo,
                         });
-                        const logCtx = flowLogger_js_1.SessionFileLogger.getContext();
-                        this.ctx.conn.cdpLogger = (info) => flowLogger_js_1.SessionFileLogger.logCdpCallEvent(info, logCtx);
-                        this.ctx.conn.cdpEventLogger = (info) => flowLogger_js_1.SessionFileLogger.logCdpMessageEvent(info, logCtx);
+                        this.ctx.conn.flowLoggerContext = this.flowLoggerContext;
                         this.ctx.conn.onTransportClosed(this._onCdpClosed);
                         this.state = {
                             kind: "LOCAL",
@@ -728,9 +751,6 @@ let V3 = (() => {
                     }
                     if (this.opts.env === "BROWSERBASE") {
                         const { apiKey, projectId } = this.requireBrowserbaseCreds();
-                        if (!apiKey || !projectId) {
-                            throw new index_js_1.MissingEnvironmentVariableError("BROWSERBASE_API_KEY and BROWSERBASE_PROJECT_ID", "Browserbase environment");
-                        }
                         this.logger({
                             category: "init",
                             message: "Starting browserbase session",
@@ -749,18 +769,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",
                                 },
                             };
@@ -784,9 +806,7 @@ let V3 = (() => {
                             env: "BROWSERBASE",
                             apiClient: this.apiClient,
                         });
-                        const logCtx = flowLogger_js_1.SessionFileLogger.getContext();
-                        this.ctx.conn.cdpLogger = (info) => flowLogger_js_1.SessionFileLogger.logCdpCallEvent(info, logCtx);
-                        this.ctx.conn.cdpEventLogger = (info) => flowLogger_js_1.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;
@@ -848,6 +868,13 @@ let V3 = (() => {
                         // ignore cleanup errors
                     }
                 }
+                try {
+                    this.detachEventStoreListener?.();
+                    this.detachEventStoreListener = null;
+                }
+                catch {
+                    // ignore cleanup errors
+                }
                 throw error;
             }
         }
@@ -891,7 +918,7 @@ let V3 = (() => {
             this.browserbaseDebugUrl = undefined;
         }
         async act(input, options) {
-            return await (0, logger_js_2.withInstanceLogContext)(this.instanceId, async () => {
+            return await this.withLoggingContext(async () => {
                 if (!this.actHandler)
                     throw new index_js_1.StagehandNotInitializedError("act()");
                 let actResult;
@@ -908,10 +935,7 @@ let V3 = (() => {
                         });
                     }
                     else {
-                        const effectiveTimeoutMs = typeof options?.timeout === "number" && options.timeout > 0
-                            ? options.timeout
-                            : undefined;
-                        const ensureTimeRemaining = (0, timeoutGuard_js_1.createTimeoutGuard)(effectiveTimeoutMs, (ms) => new sdkErrors_js_1.ActTimeoutError(ms));
+                        const ensureTimeRemaining = (0, timeoutGuard_js_1.createTimeoutGuard)(options?.timeout, (ms) => new sdkErrors_js_1.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
@@ -978,7 +1002,7 @@ let V3 = (() => {
             });
         }
         async extract(a, b, c) {
-            return await (0, logger_js_2.withInstanceLogContext)(this.instanceId, async () => {
+            return await this.withLoggingContext(async () => {
                 if (!this.extractHandler) {
                     throw new index_js_1.StagehandNotInitializedError("extract()");
                 }
@@ -1046,7 +1070,7 @@ let V3 = (() => {
             });
         }
         async observe(a, b) {
-            return await (0, logger_js_2.withInstanceLogContext)(this.instanceId, async () => {
+            return await this.withLoggingContext(async () => {
                 if (!this.observeHandler) {
                     throw new index_js_1.StagehandNotInitializedError("observe()");
                 }
@@ -1132,7 +1156,7 @@ let V3 = (() => {
             try {
                 // Close session file logger
                 try {
-                    await flowLogger_js_1.SessionFileLogger.close();
+                    await flowLogger_js_1.FlowLogger.close(this.flowLoggerContext);
                 }
                 catch {
                     // ignore
@@ -1168,6 +1192,13 @@ let V3 = (() => {
                 catch {
                     // ignore
                 }
+                try {
+                    this.detachEventStoreListener?.();
+                    this.detachEventStoreListener = null;
+                }
+                catch {
+                    // ignore
+                }
                 try {
                     this.bus.removeAllListeners();
                 }
@@ -1181,6 +1212,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_1.default.env.BROWSERBASE_API_KEY;
+        }
         /** Guard: ensure Browserbase credentials exist in options. */
         requireBrowserbaseCreds() {
             let { apiKey, projectId } = this.opts;
@@ -1190,17 +1228,13 @@ let V3 = (() => {
             if (!projectId)
                 projectId =
                     process_1.default.env.BROWSERBASE_PROJECT_ID ?? process_1.default.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 index_js_1.MissingEnvironmentVariableError(missing.join(", "), "Browserbase");
+            if (!apiKey) {
+                throw new index_js_1.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",
@@ -1344,8 +1378,14 @@ let V3 = (() => {
             const resolvedExecutionModel = options?.executionModel ?? options?.model;
             const handler = new v3AgentHandler_js_1.V3AgentHandler(this, this.logger, agentLlmClient, resolvedExecutionModel, options?.systemPrompt, tools, options?.mode);
             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 index_js_1.StagehandInvalidArgumentError('onSafetyConfirmation callback is only supported when using mode: "cua" agents.');
@@ -1425,145 +1465,59 @@ let V3 = (() => {
                     throw new index_js_1.CuaModelRequiredError(index_js_1.AVAILABLE_CUA_MODELS);
                 }
                 const agentConfigSignature = this.agentCache.buildConfigSignature(options);
-                return {
-                    execute: async (instructionOrOptions) => (0, logger_js_2.withInstanceLogContext)(this.instanceId, async () => {
-                        (0, validateExperimentalFeatures_js_1.validateExperimentalFeatures)({
-                            isExperimental: this.experimental,
-                            agentConfig: options,
-                            executeOptions: typeof instructionOrOptions === "object"
-                                ? instructionOrOptions
-                                : null,
-                        });
-                        flowLogger_js_1.SessionFileLogger.logAgentTaskStarted({
-                            invocation: "Agent.execute",
-                            args: [instructionOrOptions],
-                        });
-                        const tools = options?.integrations
-                            ? await (0, utils_js_2.resolveTools)(options.integrations, options.tools)
-                            : (options?.tools ?? {});
-                        const handler = new v3CuaAgentHandler_js_1.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 = (0, variables_js_1.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) {
-                                    flowLogger_js_1.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();
-                            }
-                            flowLogger_js_1.SessionFileLogger.logAgentTaskCompleted();
-                        }
-                    }),
-                };
-            }
-            // Default: AISDK tools-based agent
-            const agentConfigSignature = this.agentCache.buildConfigSignature(options);
-            const isStreaming = options?.stream ?? false;
-            return {
-                execute: async (instructionOrOptions) => (0, logger_js_2.withInstanceLogContext)(this.instanceId, async () => {
+                const execute = flowLogger_js_1.FlowLogger.wrapWithLogging({
+                    eventType: "AgentExecute",
+                    eventIdSuffix: "3",
+                })(async (instructionOrOptions) => this.withLoggingContext(async () => {
                     (0, validateExperimentalFeatures_js_1.validateExperimentalFeatures)({
                         isExperimental: this.experimental,
                         agentConfig: options,
                         executeOptions: typeof instructionOrOptions === "object"
                             ? instructionOrOptions
                             : null,
-                        isStreaming,
                     });
-                    flowLogger_js_1.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 (0, utils_js_2.resolveTools)(options.integrations, options.tools)
+                        : (options?.tools ?? {});
+                    const handler = new v3CuaAgentHandler_js_1.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,
+                            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 = (0, variables_js_1.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) {
-                                flowLogger_js_1.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)
-                            flowLogger_js_1.SessionFileLogger.logAgentTaskCompleted();
-                            return wrappedStream;
-                        }
-                        // Log completion when stream is returned (stream completes asynchronously)
-                        flowLogger_js_1.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) {
-                            flowLogger_js_1.SessionFileLogger.logAgentTaskCompleted({ cacheHit: true });
-                            return replayed;
-                        }
                     }
                     let agentSteps = [];
                     const shouldRecordLocally = !!cacheContext && (!this.apiClient || this.experimental);
@@ -1574,14 +1528,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();
@@ -1603,9 +1557,93 @@ let V3 = (() => {
                         if (shouldRecordLocally) {
                             this.discardAgentReplayRecording();
                         }
-                        flowLogger_js_1.SessionFileLogger.logAgentTaskCompleted();
                     }
-                }),
+                }));
+                return {
+                    execute,
+                };
+            }
+            // Default: AISDK tools-based agent
+            const agentConfigSignature = this.agentCache.buildConfigSignature(options);
+            const isStreaming = options?.stream ?? false;
+            const execute = flowLogger_js_1.FlowLogger.wrapWithLogging({
+                eventType: "AgentExecute",
+                eventIdSuffix: "3",
+            })(async (instructionOrOptions) => this.withLoggingContext(async () => {
+                (0, validateExperimentalFeatures_js_1.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,
             };
         }
     };