Fix cookie injection crash & add env var configuration

packages/browser/src/browser.ts

@@ -221,7 +221,9 @@ export class Browser extends ServiceMap.Service<Browser>()("@browser/Browser", {
 
         const contextOptions: Parameters<typeof browser.newContext>[0] = {
           ignoreHTTPSErrors: true,
-          ...(options.headed && { viewport: null }),
+          ...(options.viewport
+            ? { viewport: options.viewport }
+            : options.headed && { viewport: null }),
         };
         if (profileLocale) {
           contextOptions.locale = profileLocale;
@@ -269,10 +271,43 @@ export class Browser extends ServiceMap.Service<Browser>()("@browser/Browser", {
                 url ?? "",
                 defaultBrowserContext.preferredProfile,
               );
+          const formatted = cookies.map((cookie) => cookie.playwrightFormat);
           yield* Effect.tryPromise({
-            try: () => context.addCookies(cookies.map((cookie) => cookie.playwrightFormat)),
+            try: () => context.addCookies(formatted),
             catch: toBrowserLaunchError,
-          });
+          }).pipe(
+            Effect.catchTag("BrowserLaunchError", (batchError) =>
+              Effect.gen(function* () {
+                yield* Effect.logDebug(
+                  "Batch addCookies failed, falling back to per-cookie injection",
+                  { error: batchError.message, totalCookies: formatted.length },
+                );
+                const results = yield* Effect.forEach(
+                  formatted,
+                  (cookie) =>
+                    Effect.tryPromise({
+                      try: () => context.addCookies([cookie]),
+                      catch: toBrowserLaunchError,
+                    }).pipe(
+                      Effect.as(true),
+                      Effect.catchTag("BrowserLaunchError", (perCookieError) =>
+                        Effect.logDebug("Skipping invalid cookie", {
+                          cookieName: cookie.name,
+                          cookieDomain: cookie.domain,
+                          error: perCookieError.message,
+                        }).pipe(Effect.as(false)),
+                      ),
+                    ),
+                  { concurrency: 1 },
+                );
+                const injected = results.filter(Boolean).length;
+                yield* Effect.logInfo("Cookies injected with per-cookie fallback", {
+                  injected,
+                  skipped: formatted.length - injected,
+                });
+              }),
+            ),
+          );
         }
 
         const page = yield* Effect.tryPromise({

packages/browser/src/mcp/constants.ts

@@ -1,10 +1,13 @@
 import * as path from "node:path";
 
 export const EXPECT_COOKIE_BROWSERS_ENV_NAME = "EXPECT_COOKIE_BROWSERS";
+export const EXPECT_COOKIES_ENV_NAME = "EXPECT_COOKIES";
 export const EXPECT_CDP_URL_ENV_NAME = "EXPECT_CDP_URL";
 export const EXPECT_BASE_URL_ENV_NAME = "EXPECT_BASE_URL";
 export const EXPECT_HEADED_ENV_NAME = "EXPECT_HEADED";
 export const EXPECT_PROFILE_ENV_NAME = "EXPECT_PROFILE";
+export const EXPECT_BROWSER_ENV_NAME = "EXPECT_BROWSER";
+export const EXPECT_VIEWPORT_ENV_NAME = "EXPECT_VIEWPORT";
 export const DUPLICATE_REQUEST_WINDOW_MS = 500;
 export const TMP_ARTIFACT_OUTPUT_DIRECTORY = "/tmp/expect-artifacts";
 export const CLI_SESSION_FILE = "/tmp/expect-cli-session.json";

packages/browser/src/mcp/index.ts

@@ -1,10 +1,13 @@
 export {
   CLI_SESSION_FILE,
   EXPECT_COOKIE_BROWSERS_ENV_NAME,
+  EXPECT_COOKIES_ENV_NAME,
   EXPECT_CDP_URL_ENV_NAME,
   EXPECT_BASE_URL_ENV_NAME,
   EXPECT_HEADED_ENV_NAME,
   EXPECT_PROFILE_ENV_NAME,
+  EXPECT_BROWSER_ENV_NAME,
+  EXPECT_VIEWPORT_ENV_NAME,
   TMP_ARTIFACT_OUTPUT_DIRECTORY,
 } from "./constants";
 export { McpSession } from "./mcp-session";

packages/browser/src/mcp/mcp-session.ts

@@ -14,7 +14,6 @@ import {
   AGENT_OVERLAY_CONTAINER_ID,
   BROWSER_CLOSE_TIMEOUT_MS,
   OVERLAY_REINJECT_TIMEOUT_MS,
-  VIDEO_PATH_TIMEOUT_MS,
 } from "../constants";
 import type {
   AnnotatedScreenshotOptions,
@@ -24,10 +23,13 @@ import type {
 } from "../types";
 import {
   EXPECT_COOKIE_BROWSERS_ENV_NAME,
+  EXPECT_COOKIES_ENV_NAME,
   EXPECT_CDP_URL_ENV_NAME,
   EXPECT_BASE_URL_ENV_NAME,
   EXPECT_HEADED_ENV_NAME,
   EXPECT_PROFILE_ENV_NAME,
+  EXPECT_BROWSER_ENV_NAME,
+  EXPECT_VIEWPORT_ENV_NAME,
   TMP_ARTIFACT_OUTPUT_DIRECTORY,
 } from "./constants";
 import { McpSessionNotOpenError } from "./errors";
@@ -72,8 +74,6 @@ export interface OpenResult {
 }
 
 export interface CloseResult {
-  readonly videoPath: string | undefined;
-  readonly tmpVideoPath: string | undefined;
   readonly screenshotPaths: readonly string[];
 }
 
@@ -87,7 +87,6 @@ interface BrowserOpenAnalyticsProperties {
   readonly cookie_count: number;
 }
 
-const PLAYWRIGHT_VIDEO_SUBDIRECTORY = "playwright";
 
 const setupPageTracking = (page: Page, sessionData: BrowserSessionData) => {
   if (sessionData.trackedPages.has(page)) return;
@@ -150,11 +149,29 @@ export class McpSession extends ServiceMap.Service<McpSession>()("@browser/McpSe
     });
     const profileConfig = yield* Config.option(Config.string(EXPECT_PROFILE_ENV_NAME));
     const configuredProfileName = Option.getOrUndefined(profileConfig);
+    const cookiesConfig = yield* Config.option(Config.string(EXPECT_COOKIES_ENV_NAME));
+    const defaultCookiesEnabled = Option.match(cookiesConfig, {
+      onNone: () => false,
+      onSome: (value) => value !== "false",
+    });
+    const browserConfig = yield* Config.option(Config.string(EXPECT_BROWSER_ENV_NAME));
+    const defaultBrowserEngine = Option.getOrUndefined(browserConfig) as
+      | BrowserEngine
+      | undefined;
+    const viewportConfig = yield* Config.option(Config.string(EXPECT_VIEWPORT_ENV_NAME));
+    const configuredViewport = Option.match(viewportConfig, {
+      onNone: () => undefined,
+      onSome: (value) => {
+        const match = /^(\d+)x(\d+)$/i.exec(value.trim());
+        if (!match) return undefined;
+        return { width: parseInt(match[1]!, 10), height: parseInt(match[2]!, 10) };
+      },
+    });
     const cookieBrowserKeys = Option.match(cookieBrowsersConfig, {
       onNone: (): string[] => [],
       onSome: (value) => value.split(",").filter(Boolean),
     });
-    const cookiesDisabled = cookieBrowserKeys.length === 0;
+    const cookiesDisabled = cookieBrowserKeys.length === 0 && !defaultCookiesEnabled;
 
     const sessionRef = yield* Ref.make<BrowserSessionData | undefined>(undefined);
     const preExtractedCookiesRef = yield* Ref.make<Cookie[] | undefined>(undefined);
@@ -290,23 +307,11 @@ export class McpSession extends ServiceMap.Service<McpSession>()("@browser/McpSe
       yield* Effect.annotateCurrentSpan({ url });
       yield* Ref.set(savedScreenshotPathsRef, []);
 
-      const cookiesOption = yield* resolveCookies(options.cookies);
-      const videoOutputDir = path.join(
-        TMP_ARTIFACT_OUTPUT_DIRECTORY,
-        PLAYWRIGHT_VIDEO_SUBDIRECTORY,
-      );
-
-      yield* fileSystem
-        .makeDirectory(videoOutputDir, { recursive: true })
-        .pipe(
-          Effect.catchCause((cause) =>
-            Effect.logDebug("Failed to create Playwright video directory", { cause }),
-          ),
-        );
+      const cookiesOption = yield* resolveCookies(options.cookies ?? defaultCookiesEnabled);
 
       const explicitCdpUrl = Option.orElse(options.cdpUrl ?? Option.none(), () => defaultCdpUrl);
       const headed = options.headed ?? isHeadedDefault;
-      const engine = options.browserType ?? "chromium";
+      const engine = options.browserType ?? defaultBrowserEngine ?? "chromium";
       yield* Ref.set(isHeadedRef, headed);
 
       const useSystemChrome =
@@ -362,9 +367,9 @@ export class McpSession extends ServiceMap.Service<McpSession>()("@browser/McpSe
         headed,
         cookies: cookiesOption,
         waitUntil: options.waitUntil,
-        videoOutputDir,
         cdpUrl,
         browserType: engine,
+        viewport: configuredViewport,
       });
 
       const sessionData: BrowserSessionData = {
@@ -493,9 +498,6 @@ export class McpSession extends ServiceMap.Service<McpSession>()("@browser/McpSe
 
       yield* Ref.set(sessionRef, undefined);
 
-      const pageVideo = activeSession.page.video();
-      const artifactBaseName = `session-${Date.now()}`;
-
       if (!activeSession.page.isClosed()) {
         yield* evaluateRuntime(
           activeSession.page,
@@ -532,50 +534,7 @@ export class McpSession extends ServiceMap.Service<McpSession>()("@browser/McpSe
         ),
       );
 
-      let videoPath: string | undefined;
-      let tmpVideoPath: string | undefined;
-
-      if (pageVideo) {
-        videoPath = yield* Effect.tryPromise(() => pageVideo.path()).pipe(
-          Effect.timeoutOrElse({
-            duration: `${VIDEO_PATH_TIMEOUT_MS} millis`,
-            onTimeout: () => Effect.succeed(undefined),
-          }),
-          Effect.catchCause((cause) =>
-            Effect.logDebug("Failed to resolve Playwright video path", { cause }).pipe(
-              Effect.as(undefined),
-            ),
-          ),
-        );
-
-        if (videoPath) {
-          yield* fileSystem
-            .makeDirectory(TMP_ARTIFACT_OUTPUT_DIRECTORY, { recursive: true })
-            .pipe(
-              Effect.catchCause((cause) =>
-                Effect.logDebug("Failed to create /tmp artifact directory", { cause }),
-              ),
-            );
-
-          const tmpVideoFilePath = path.join(
-            TMP_ARTIFACT_OUTPUT_DIRECTORY,
-            `${artifactBaseName}.webm`,
-          );
-
-          yield* fileSystem
-            .copyFile(videoPath, tmpVideoFilePath)
-            .pipe(
-              Effect.catchCause((cause) =>
-                Effect.logDebug("Failed to copy video to /tmp", { cause }),
-              ),
-            );
-          tmpVideoPath = tmpVideoFilePath;
-        }
-      }
-
       return {
-        videoPath,
-        tmpVideoPath,
         screenshotPaths: yield* Ref.get(savedScreenshotPathsRef),
       } satisfies CloseResult;
     });

packages/browser/src/mcp/server.ts

@@ -689,11 +689,6 @@ export const createBrowserMcpServer = <E>(
             ),
           );
           const lines = ["Browser closed."];
-          if (result.tmpVideoPath) {
-            lines.push(`Playwright video: ${result.tmpVideoPath}`);
-          } else if (result.videoPath) {
-            lines.push(`Playwright video: ${result.videoPath}`);
-          }
           for (const screenshotPath of result.screenshotPaths) {
             lines.push(`Screenshot: ${screenshotPath}`);
           }

packages/browser/src/types.ts

@@ -53,6 +53,7 @@ export interface CreatePageOptions {
   videoOutputDir?: string;
   cdpUrl?: Option.Option<string>;
   browserType?: BrowserEngine;
+  viewport?: { width: number; height: number };
 }
 
 export interface AnnotatedScreenshotOptions extends SnapshotOptions {

packages/cookies/src/types.ts

@@ -91,7 +91,7 @@ export class Cookie extends Schema.Class<Cookie>("@cookies/Cookie")({
       expires: this.expires ?? SESSION_EXPIRES,
       secure: this.secure,
       httpOnly: this.httpOnly,
-      sameSite: this.sameSite,
+      ...(this.sameSite !== undefined && { sameSite: this.sameSite }),
     };
   }
 }