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

package/dist/esm/lib/v3/v3.d.ts

@@ -1,11 +1,12 @@
-import { EventEmitter } from "events";
 import { z } from "zod";
 import { InferStagehandSchema, StagehandZodSchema } from "./zodCompat.js";
 import { LLMClient } from "./llm/LLMClient.js";
 import { AgentReplayStep } from "./types/private/index.js";
 import { AgentConfig, AgentExecuteOptions, AgentStreamExecuteOptions, AgentResult, LogLine, StagehandMetrics, Action, ActOptions, ActResult, defaultExtractSchema, ExtractOptions, HistoryEntry, ObserveOptions, pageTextSchema, V3FunctionName, V3Options, AgentStreamResult } from "./types/public/index.js";
 import { V3Context } from "./understudy/context.js";
-import { type FlowLoggerContext } from "./flowLogger.js";
+import { type FlowLoggerContext } from "./flowlogger/FlowLogger.js";
+import { EventEmitterWithWildcardSupport } from "./flowlogger/EventEmitter.js";
+import { EventStore } from "./flowlogger/EventStore.js";
 /**
  * V3
  *
@@ -33,7 +34,7 @@ export declare class V3 {
      * Event bus for internal communication.
      * Emits events like 'screenshot' when screenshots are captured during agent execution.
      */
-    readonly bus: EventEmitter;
+    readonly bus: EventEmitterWithWildcardSupport;
     private modelName;
     private modelClientOptions;
     private llmProvider;
@@ -72,6 +73,7 @@ export declare class V3 {
     private _history;
     private readonly instanceId;
     private readonly sessionId;
+    readonly eventStore: EventStore;
     readonly flowLoggerContext: FlowLoggerContext;
     private static _processGuardsInstalled;
     private static _instances;
@@ -81,8 +83,6 @@ export declare class V3 {
     private apiClient;
     private keepAlive?;
     private shutdownSupervisor;
-    private detachEventStoreListener;
-    private withLoggingContext;
     stagehandMetrics: StagehandMetrics;
     constructor(opts: V3Options);
     /**

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";
@@ -63,8 +62,9 @@ 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 { FlowLogger } from "./flowLogger.js";
-import { getEventStore } from "./eventStore.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";
@@ -114,15 +114,12 @@ let V3 = (() => {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
             _act_decorators = [FlowLogger.wrapWithLogging({
                     eventType: "StagehandAct",
-                    eventIdSuffix: "4",
                 })];
             _extract_decorators = [FlowLogger.wrapWithLogging({
                     eventType: "StagehandExtract",
-                    eventIdSuffix: "4",
                 })];
             _observe_decorators = [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);
@@ -140,7 +137,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;
@@ -209,6 +206,7 @@ let V3 = (() => {
         _history = [];
         instanceId;
         sessionId;
+        eventStore;
         flowLoggerContext;
         static _processGuardsInstalled = false;
         static _instances = new Set();
@@ -218,10 +216,6 @@ let V3 = (() => {
         apiClient = null;
         keepAlive;
         shutdownSupervisor = null;
-        detachEventStoreListener = null;
-        withLoggingContext(fn) {
-            return withInstanceLogContext(this.instanceId, fn);
-        }
         stagehandMetrics = {
             actPromptTokens: 0,
             actCompletionTokens: 0,
@@ -346,9 +340,21 @@ let V3 = (() => {
                 act: this.act.bind(this),
             });
             this.opts = opts;
-            void getEventStore().initializeSession(this.sessionId, opts);
+            // FlowLogger always gets a per-instance session context and shared event
+            // bus. The attached EventStore decides which sinks are active:
+            // `verbose: 2` or `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);
-            this.detachEventStoreListener = getEventStore().attachBus(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);
         }
@@ -555,7 +561,7 @@ let V3 = (() => {
          */
         async init() {
             try {
-                return await this.withLoggingContext(async () => {
+                return await withInstanceLogContext(this.instanceId, async () => {
                     this.actHandler = new 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(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(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));
@@ -720,9 +726,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,
@@ -829,13 +839,6 @@ let V3 = (() => {
                         // ignore cleanup errors
                     }
                 }
-                try {
-                    this.detachEventStoreListener?.();
-                    this.detachEventStoreListener = null;
-                }
-                catch {
-                    // ignore cleanup errors
-                }
                 throw error;
             }
         }
@@ -879,7 +882,7 @@ let V3 = (() => {
             this.browserbaseDebugUrl = undefined;
         }
         async act(input, options) {
-            return await this.withLoggingContext(async () => {
+            return await withInstanceLogContext(this.instanceId, async () => {
                 if (!this.actHandler)
                     throw new StagehandNotInitializedError("act()");
                 let actResult;
@@ -963,7 +966,7 @@ let V3 = (() => {
             });
         }
         async extract(a, b, c) {
-            return await this.withLoggingContext(async () => {
+            return await withInstanceLogContext(this.instanceId, async () => {
                 if (!this.extractHandler) {
                     throw new StagehandNotInitializedError("extract()");
                 }
@@ -1031,7 +1034,7 @@ let V3 = (() => {
             });
         }
         async observe(a, b) {
-            return await this.withLoggingContext(async () => {
+            return await withInstanceLogContext(this.instanceId, async () => {
                 if (!this.observeHandler) {
                     throw new StagehandNotInitializedError("observe()");
                 }
@@ -1154,8 +1157,7 @@ let V3 = (() => {
                     // ignore
                 }
                 try {
-                    this.detachEventStoreListener?.();
-                    this.detachEventStoreListener = null;
+                    await this.eventStore.destroy();
                 }
                 catch {
                     // ignore
@@ -1426,10 +1428,7 @@ let V3 = (() => {
                     throw new CuaModelRequiredError(AVAILABLE_CUA_MODELS);
                 }
                 const agentConfigSignature = this.agentCache.buildConfigSignature(options);
-                const execute = FlowLogger.wrapWithLogging({
-                    eventType: "AgentExecute",
-                    eventIdSuffix: "3",
-                })(async (instructionOrOptions) => this.withLoggingContext(async () => {
+                const execute = async (instructionOrOptions) => withInstanceLogContext(this.instanceId, async () => {
                     validateExperimentalFeatures({
                         isExperimental: this.experimental,
                         agentConfig: options,
@@ -1519,18 +1518,18 @@ let V3 = (() => {
                             this.discardAgentReplayRecording();
                         }
                     }
-                }));
+                });
                 return {
-                    execute,
+                    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 = FlowLogger.wrapWithLogging({
-                eventType: "AgentExecute",
-                eventIdSuffix: "3",
-            })(async (instructionOrOptions) => this.withLoggingContext(async () => {
+            const execute = async (instructionOrOptions) => withInstanceLogContext(this.instanceId, async () => {
                 validateExperimentalFeatures({
                     isExperimental: this.experimental,
                     agentConfig: options,
@@ -1602,9 +1601,12 @@ let V3 = (() => {
                         this.discardAgentReplayRecording();
                     }
                 }
-            }));
+            });
             return {
-                execute,
+                execute: FlowLogger.wrapWithLogging({
+                    eventType: "AgentExecute",
+                    context: this.flowLoggerContext,
+                })(execute),
             };
         }
     };