@push.rocks/smartpuppeteer 2.5.0 → 2.7.0

package/ts/smartpuppeteer.classes.livebrowsersession.ts

@@ -33,6 +33,8 @@ import type {
   ILiveBrowserOperationOptions,
   ILiveBrowserPressOptions,
   ILiveBrowserProcessState,
+  ILiveBrowserScreencastOptions,
+  ILiveBrowserScreencastUpdateOptions,
   ILiveBrowserSessionOptions,
   ILiveBrowserSnapshot,
   ILiveBrowserSnapshotOptions,
@@ -64,6 +66,7 @@ const maxSelectorLength = 4096;
 const maxTextLength = 32768;
 const maxUrlLength = 16384;
 const maxTimeoutMs = 60000;
+const maxWheelDelta = 1000000;
 const frameAcknowledgementTimeoutMs = 5000;
 const defaultFirstFrameTimeoutMs = 5000;
 const maxQueuedPublicOperations = 64;
@@ -82,10 +85,12 @@ const maxProxySecuritySessions = 256;
 const maxTrackedProxyRequests = 1024;
 const maxTotalTrackedProxyRequests = 4096;
 const maxProxySecurityOperations = 2048;
+const maxTrackedServiceWorkerVersions = 512;
+const proxySecurityCommandTimeoutMs = 5000;
+const proxySecurityCommandOptions = { timeout: proxySecurityCommandTimeoutMs } as const;
 const proxySeedTargetTypes = new Set([
   'background_page',
   'page',
-  'service_worker',
   'shared_worker',
   'webview',
 ]);
@@ -99,6 +104,9 @@ type TProxyAuthRequiredEvent = plugins.puppeteer.Protocol.Fetch.AuthRequiredEven
 type TProxyRequestPausedEvent = plugins.puppeteer.Protocol.Fetch.RequestPausedEvent;
 type TNetworkLoadingFinishedEvent = plugins.puppeteer.Protocol.Network.LoadingFinishedEvent;
 type TNetworkLoadingFailedEvent = plugins.puppeteer.Protocol.Network.LoadingFailedEvent;
+type TServiceWorkerVersionUpdatedEvent = (
+  plugins.puppeteer.Protocol.ServiceWorker.WorkerVersionUpdatedEvent
+);
 
 interface IProxySecuritySession {
   session: plugins.puppeteer.CDPSession;
@@ -108,6 +116,7 @@ interface IProxySecuritySession {
   fetchEnabled: boolean;
   allowLiveTargetDetach: boolean;
   ownedByProxySecurity: boolean;
+  retireWhenIdle: boolean;
   attemptedAuthentications: Set<string>;
   requestIdsByNetworkId: Map<string, string>;
   authRequiredListener: (event: TProxyAuthRequiredEvent) => void;
@@ -130,6 +139,34 @@ interface IScreencastAuthority {
   controller: AbortController;
 }
 
+interface IPendingWheelDispatch {
+  cdpSession: plugins.puppeteer.CDPSession;
+  generation: number;
+  viewportRevision: number;
+  x: number;
+  y: number;
+  deltaX: number;
+  deltaY: number;
+  modifiers: number;
+  promise: Promise<void>;
+  resolve: () => void;
+  reject: (error: unknown) => void;
+}
+
+interface IQueuedWheelInput {
+  kind: 'wheel';
+  dispatch: IPendingWheelDispatch;
+}
+
+interface IQueuedEventInput {
+  kind: 'event';
+  send: () => Promise<void>;
+  resolve: () => void;
+  reject: (error: unknown) => void;
+}
+
+type TQueuedTabInput = IQueuedWheelInput | IQueuedEventInput;
+
 interface IPrivateLiveBrowserTab {
   id: string;
   page: plugins.puppeteer.Page;
@@ -146,13 +183,17 @@ interface IPrivateLiveBrowserTab {
   closing: boolean;
   stateUpdateQueued: boolean;
   stateUpdatePending: boolean;
-  navigationResetPending: boolean;
+  navigationResetRevision: number;
+  restoredNavigationRevision: number;
   evaluationExecutionContextId?: number;
   securityCdpSession?: plugins.puppeteer.CDPSession;
   cdpSession?: plugins.puppeteer.CDPSession;
   cdpConnection?: plugins.puppeteer.Connection;
   screencastFrameListener?: TScreencastFrameListener;
   cdpSessionDetachedListener?: TCdpSessionDetachedListener;
+  inputQueue: TQueuedTabInput[];
+  inputPumpActive: boolean;
+  wheelDispatchInFlight?: Promise<void>;
   removeListeners: Array<() => void>;
 }
 
@@ -379,6 +420,80 @@ const createPuppeteerViewport = (
   hasTouch: false,
 });
 
+const validateScreencastOptions = (
+  options: ILiveBrowserScreencastOptions | undefined,
+): void => {
+  if (!options) {
+    return;
+  }
+  if (options.format !== undefined && options.format !== 'jpeg' && options.format !== 'png') {
+    throw new Error('screencast.format must be jpeg or png');
+  }
+  if (options.quality !== undefined) {
+    validateInteger(options.quality, 'screencast.quality', 0, 100);
+  }
+  if (options.maxWidth !== undefined) {
+    validateInteger(options.maxWidth, 'screencast.maxWidth', 1, maxViewportWidth);
+  }
+  if (options.maxHeight !== undefined) {
+    validateInteger(options.maxHeight, 'screencast.maxHeight', 1, maxViewportHeight);
+  }
+  if (
+    options.maxWidth !== undefined
+    && options.maxHeight !== undefined
+    && options.maxWidth * options.maxHeight > maxViewportPixelArea
+  ) {
+    throw new Error(
+      `screencast pixel area must not exceed ${maxViewportPixelArea} pixels`,
+    );
+  }
+  if (options.everyNthFrame !== undefined) {
+    validateInteger(options.everyNthFrame, 'screencast.everyNthFrame', 1, 100);
+  }
+  if (options.maxOutstandingFrames !== undefined) {
+    validateInteger(
+      options.maxOutstandingFrames,
+      'screencast.maxOutstandingFrames',
+      1,
+      liveBrowserMaxOutstandingFrames,
+    );
+  }
+  if (options.firstFrameTimeoutMs !== undefined) {
+    validateInteger(
+      options.firstFrameTimeoutMs,
+      'screencast.firstFrameTimeoutMs',
+      100,
+      maxTimeoutMs,
+    );
+  }
+};
+
+const screencastUpdateKeys = ['quality', 'maxWidth', 'maxHeight', 'everyNthFrame'] as const;
+
+const normalizeScreencastUpdate = (
+  optionsArg: ILiveBrowserScreencastUpdateOptions,
+): ILiveBrowserScreencastUpdateOptions => {
+  if (!optionsArg || typeof optionsArg !== 'object' || Array.isArray(optionsArg)) {
+    throw new Error('screencast update options must be an object');
+  }
+  const update: ILiveBrowserScreencastUpdateOptions = {};
+  for (const key of Object.keys(optionsArg)) {
+    if (!(screencastUpdateKeys as readonly string[]).includes(key)) {
+      throw new Error(`Unknown screencast update option: ${key}`);
+    }
+    const value = optionsArg[key as keyof ILiveBrowserScreencastUpdateOptions];
+    if (value !== undefined) {
+      update[key as keyof ILiveBrowserScreencastUpdateOptions] = value;
+    }
+  }
+  validateScreencastOptions(update);
+  return update;
+};
+
+const clampWheelDelta = (value: number): number => {
+  return Math.max(-maxWheelDelta, Math.min(maxWheelDelta, value));
+};
+
 export class LiveBrowserSession {
   private readonly options: ILiveBrowserSessionOptions;
   private readonly eventListeners = new Set<TLiveBrowserEventListener>();
@@ -396,8 +511,18 @@ export class LiveBrowserSession {
   private browserSecurityCdpSession?: plugins.puppeteer.CDPSession;
   private browserSecurityConnection?: plugins.puppeteer.Connection;
   private browserSecuritySessionAttachedListener?: (session: plugins.puppeteer.CDPSession) => void;
+  private browserSecurityOwnedSessionAttachedListener?: (
+    session: plugins.puppeteer.CDPSession,
+  ) => void;
   private browserSecuritySessionDetachedListener?: TCdpSessionDetachedListener;
+  private browserSecurityWorkerLifecycleCdpSession?: plugins.puppeteer.CDPSession;
+  private browserSecurityWorkerVersionUpdatedListener?: (
+    event: TServiceWorkerVersionUpdatedEvent,
+  ) => void;
   private readonly proxySecuritySessions = new Map<string, IProxySecuritySession>();
+  private readonly ownedProxySecuritySessions = new Set<plugins.puppeteer.CDPSession>();
+  private readonly browserSecurityParentOwnedSessions = new Set<plugins.puppeteer.CDPSession>();
+  private readonly serviceWorkerTargetIdsByVersionId = new Map<string, string>();
   private readonly proxySecurityOperations = new Set<Promise<void>>();
   private proxySecurityGeneration = 0;
   private proxySecurityStopping = false;
@@ -507,7 +632,7 @@ export class LiveBrowserSession {
         : undefined,
     };
     this.viewport = { ...viewport };
-    this.validateScreencastOptions();
+    validateScreencastOptions(this.options.screencast);
     this.maxOutstandingFrames = this.options.screencast?.maxOutstandingFrames
       ?? liveBrowserDefaultMaxOutstandingFrames;
   }
@@ -838,58 +963,95 @@ export class LiveBrowserSession {
   public refreshScreencast(
     operationOptions: ILiveBrowserOperationOptions = {},
   ): Promise<ILiveBrowserFrameIdentity> {
+    return this.enqueuePublicOperation(
+      (signal) => this.restartActiveScreencast(signal),
+      operationOptions,
+    );
+  }
+
+  public async updateScreencastOptions(
+    optionsArg: ILiveBrowserScreencastUpdateOptions,
+    operationOptions: ILiveBrowserOperationOptions = {},
+  ): Promise<ILiveBrowserFrameIdentity | null> {
+    const update = normalizeScreencastUpdate(optionsArg);
     return this.enqueuePublicOperation(async (signal) => {
       signal.throwIfAborted();
-      const tab = this.requireActiveTab();
-      if (!tab.streaming || tab.streamInvalidated) {
-        throw new Error(`Tab input transport is not available: ${tab.id}`);
+      const screencast: ILiveBrowserScreencastOptions = {
+        ...this.options.screencast,
+        ...update,
+      };
+      validateScreencastOptions(screencast);
+      this.options.screencast = screencast;
+      const activeTab = this.status === 'running' && this.activeTabId
+        ? this.tabs.get(this.activeTabId)
+        : undefined;
+      if (!activeTab?.streaming) {
+        return null;
       }
-      let firstFrame: ReturnType<LiveBrowserSession['waitForScreencastFrame']> | undefined;
-      let timeout: ReturnType<typeof setTimeout> | undefined;
-      try {
-        const previousLifecycleRevision = tab.streamLifecycleRevision;
+      return this.restartActiveScreencast(signal);
+    }, operationOptions);
+  }
+
+  private async restartActiveScreencast(
+    signal: AbortSignal,
+  ): Promise<ILiveBrowserFrameIdentity> {
+    signal.throwIfAborted();
+    const tab = this.requireActiveTab();
+    let firstFrame: ReturnType<LiveBrowserSession['waitForScreencastFrame']> | undefined;
+    let timeout: ReturnType<typeof setTimeout> | undefined;
+    let restartPromise: Promise<void> | undefined;
+    try {
+      let refreshLifecycleRevision = tab.streamLifecycleRevision;
+      if (tab.streaming) {
         await this.stopScreencast(tab);
-        const refreshLifecycleRevision = previousLifecycleRevision + 1;
-        if (
-          !this.canRestoreScreencast(tab)
-          || tab.streamLifecycleRevision !== refreshLifecycleRevision
-        ) {
-          throw new Error(`Screencast lifecycle changed while refreshing tab: ${tab.id}`);
-        }
-        const authority = this.createScreencastAuthority(tab, refreshLifecycleRevision);
-        const generation = tab.generation + 1;
-        firstFrame = this.waitForScreencastFrame(
-          tab,
-          generation,
-          this.viewportRevision,
-          authority.controller.signal,
-        );
-        const refreshTimeoutMs = this.options.screencast?.firstFrameTimeoutMs
-          ?? defaultFirstFrameTimeoutMs;
-        const refreshTimeout = new Promise<never>((_resolve, reject) => {
-          timeout = setTimeout(() => {
-            reject(new Error(
-              `Screencast generation ${generation} did not restart and produce a frame within ${
-                refreshTimeoutMs
-              }ms`,
-            ));
-          }, refreshTimeoutMs);
-        });
-        const restartPromise = this.startScreencast(tab, authority);
-        const [, identity] = await Promise.race([
-          Promise.all([restartPromise, firstFrame.promise]),
-          refreshTimeout,
-        ]);
-        return identity;
-      } catch (error) {
-        if (!this.canRestoreScreencast(tab)) throw error;
-        const refreshError: ILiveBrowserError = {
-          code: 'screencast_refresh_failed',
-          message: normalizeErrorMessage(error),
-          fatal: true,
-          tabId: tab.id,
-        };
-        this.emitError(refreshError);
+        refreshLifecycleRevision += 1;
+      }
+      if (
+        !this.canRestoreScreencast(tab)
+        || tab.streaming
+        || tab.streamLifecycleRevision !== refreshLifecycleRevision
+      ) {
+        throw new Error(`Screencast lifecycle changed while refreshing tab: ${tab.id}`);
+      }
+      const authority = this.createScreencastAuthority(tab, refreshLifecycleRevision);
+      const generation = tab.generation + 1;
+      firstFrame = this.waitForScreencastFrame(
+        tab,
+        generation,
+        this.viewportRevision,
+        authority.controller.signal,
+      );
+      const refreshTimeoutMs = this.options.screencast?.firstFrameTimeoutMs
+        ?? defaultFirstFrameTimeoutMs;
+      const refreshTimeout = new Promise<never>((_resolve, reject) => {
+        timeout = setTimeout(() => {
+          reject(new Error(
+            `Screencast generation ${generation} did not restart and produce a frame within ${
+              refreshTimeoutMs
+            }ms`,
+          ));
+        }, refreshTimeoutMs);
+      });
+      restartPromise = this.startScreencast(tab, authority);
+      const [, identity] = await Promise.race([
+        Promise.all([restartPromise, firstFrame.promise]),
+        refreshTimeout,
+      ]);
+      return identity;
+    } catch (error) {
+      if (!this.canRestoreScreencast(tab)) throw error;
+      await this.abandonScreencastRestart(tab, restartPromise, error);
+      // Browser loss is the only refresh failure that is not tab-recoverable; the
+      // disconnect listener normally revokes restoration first, so this stays a guard.
+      const fatal = this.browser !== undefined && !this.browser.connected;
+      const refreshError: ILiveBrowserError = {
+        code: 'screencast_refresh_failed',
+        message: normalizeErrorMessage(error),
+        fatal,
+        tabId: tab.id,
+      };
+      this.emitError(refreshError);
+      if (fatal) {
         void this.requestShutdown(refreshError).catch((shutdownError) => {
           this.emitError({
             code: 'screencast_refresh_shutdown_failed',
@@ -898,12 +1060,27 @@ export class LiveBrowserSession {
             tabId: tab.id,
           });
         });
-        throw error;
-      } finally {
-        if (timeout) clearTimeout(timeout);
-        firstFrame?.cancel();
       }
-    }, operationOptions);
+      throw error;
+    } finally {
+      if (timeout) clearTimeout(timeout);
+      firstFrame?.cancel();
+    }
+  }
+
+  private async abandonScreencastRestart(
+    tab: IPrivateLiveBrowserTab,
+    restartPromise: Promise<void> | undefined,
+    reason: unknown,
+  ): Promise<void> {
+    // Revoke the restart authority so an in-flight startScreencast() unwinds, then
+    // retire anything it already established. The tab stays open and invalidated so
+    // a later refresh, viewport change, or activation can start a new generation.
+    this.invalidateScreencast(tab, reason);
+    if (restartPromise) {
+      await restartPromise.catch(() => {});
+    }
+    await this.stopScreencast(tab);
   }
 
   public async createTab(
@@ -1133,43 +1310,73 @@ export class LiveBrowserSession {
     const clickCount = input.clickCount === undefined
       ? undefined
       : validateInteger(input.clickCount, 'clickCount', 0, 3);
+    const modifiers = this.createModifierMask(input.modifiers);
 
-    try {
-      await cdpSession.send('Input.dispatchMouseEvent', {
+    await this.dispatchTabInput(tab, cdpSession, () => cdpSession.send(
+      'Input.dispatchMouseEvent',
+      {
         type,
         x: input.x,
         y: input.y,
         button,
         buttons,
         clickCount,
-        modifiers: this.createModifierMask(input.modifiers),
+        modifiers,
         pointerType: 'mouse',
-      });
-    } catch (error) {
-      this.handlePossibleCdpDisconnection(tab, cdpSession, error);
-      throw error;
-    }
+      },
+    ));
   }
 
   public async dispatchWheel(input: ILiveBrowserWheelInput): Promise<void> {
     const { tab, cdpSession } = this.requireRawInputTarget(input);
     this.validateCoordinates(input.x, input.y);
-    validateFiniteNumber(input.deltaX, 'deltaX', -1000000, 1000000);
-    validateFiniteNumber(input.deltaY, 'deltaY', -1000000, 1000000);
-    try {
-      await cdpSession.send('Input.dispatchMouseEvent', {
-        type: 'mouseWheel',
+    const deltaX = validateFiniteNumber(input.deltaX, 'deltaX', -maxWheelDelta, maxWheelDelta);
+    const deltaY = validateFiniteNumber(input.deltaY, 'deltaY', -maxWheelDelta, maxWheelDelta);
+    const modifiers = this.createModifierMask(input.modifiers);
+
+    // Queued input only waits while an earlier wheel dispatch is in flight; wheel
+    // input for the same stream merges into a wheel entry still waiting at the tail.
+    const lastQueuedInput = tab.inputQueue[tab.inputQueue.length - 1];
+    if (
+      lastQueuedInput?.kind === 'wheel'
+      && lastQueuedInput.dispatch.cdpSession === cdpSession
+      && lastQueuedInput.dispatch.generation === input.generation
+      && lastQueuedInput.dispatch.viewportRevision === input.viewportRevision
+    ) {
+      const pendingDispatch = lastQueuedInput.dispatch;
+      pendingDispatch.x = input.x;
+      pendingDispatch.y = input.y;
+      pendingDispatch.deltaX = clampWheelDelta(pendingDispatch.deltaX + deltaX);
+      pendingDispatch.deltaY = clampWheelDelta(pendingDispatch.deltaY + deltaY);
+      pendingDispatch.modifiers = modifiers;
+      return pendingDispatch.promise;
+    }
+
+    let resolveDispatch!: () => void;
+    let rejectDispatch!: (error: unknown) => void;
+    const promise = new Promise<void>((resolve, reject) => {
+      resolveDispatch = resolve;
+      rejectDispatch = reject;
+    });
+    void promise.catch(() => {});
+    tab.inputQueue.push({
+      kind: 'wheel',
+      dispatch: {
+        cdpSession,
+        generation: input.generation,
+        viewportRevision: input.viewportRevision,
         x: input.x,
         y: input.y,
-        deltaX: input.deltaX,
-        deltaY: input.deltaY,
-        modifiers: this.createModifierMask(input.modifiers),
-        pointerType: 'mouse',
-      });
-    } catch (error) {
-      this.handlePossibleCdpDisconnection(tab, cdpSession, error);
-      throw error;
-    }
+        deltaX,
+        deltaY,
+        modifiers,
+        promise,
+        resolve: resolveDispatch,
+        reject: rejectDispatch,
+      },
+    });
+    this.pumpTabInput(tab);
+    return promise;
   }
 
   public async dispatchKey(input: ILiveBrowserKeyInput): Promise<void> {
@@ -1203,9 +1410,11 @@ export class LiveBrowserSession {
       : validateInteger(input.location, 'location', 0, 3);
     validateOptionalBoolean(input.autoRepeat, 'autoRepeat');
     validateOptionalBoolean(input.isKeypad, 'isKeypad');
+    const modifiers = this.createModifierMask(input.modifiers);
 
-    try {
-      await cdpSession.send('Input.dispatchKeyEvent', {
+    await this.dispatchTabInput(tab, cdpSession, () => cdpSession.send(
+      'Input.dispatchKeyEvent',
+      {
         type,
         key,
         code,
@@ -1216,22 +1425,97 @@ export class LiveBrowserSession {
         autoRepeat: input.autoRepeat,
         isKeypad: input.isKeypad,
         location,
-        modifiers: this.createModifierMask(input.modifiers),
-      });
-    } catch (error) {
-      this.handlePossibleCdpDisconnection(tab, cdpSession, error);
-      throw error;
-    }
+        modifiers,
+      },
+    ));
   }
 
   public async insertText(input: ILiveBrowserInsertTextInput): Promise<void> {
     const { tab, cdpSession } = this.requireRawInputTarget(input);
     const text = validateBoundedString(input.text, 'text', 0, maxTextLength);
+    await this.dispatchTabInput(tab, cdpSession, () => cdpSession.send(
+      'Input.insertText',
+      { text },
+    ));
+  }
+
+  private dispatchTabInput(
+    tab: IPrivateLiveBrowserTab,
+    cdpSession: plugins.puppeteer.CDPSession,
+    send: () => Promise<unknown>,
+  ): Promise<void> {
+    const guardedSend = async (): Promise<void> => {
+      try {
+        await send();
+      } catch (error) {
+        this.handlePossibleCdpDisconnection(tab, cdpSession, error);
+        throw error;
+      }
+    };
+    // Chromium does not keep a pipelined mouse or key event behind an earlier wheel
+    // command, so any input behind wheel input waits until that wheel dispatch settles.
+    if (tab.inputQueue.length === 0 && !tab.wheelDispatchInFlight) {
+      return guardedSend();
+    }
+    return new Promise<void>((resolve, reject) => {
+      tab.inputQueue.push({ kind: 'event', send: guardedSend, resolve, reject });
+      this.pumpTabInput(tab);
+    });
+  }
+
+  private pumpTabInput(tab: IPrivateLiveBrowserTab): void {
+    if (tab.inputPumpActive) {
+      return;
+    }
+    tab.inputPumpActive = true;
+    void (async () => {
+      try {
+        while (tab.inputQueue.length > 0) {
+          const wheelDispatchInFlight = tab.wheelDispatchInFlight;
+          if (wheelDispatchInFlight) {
+            await wheelDispatchInFlight;
+            if (tab.wheelDispatchInFlight === wheelDispatchInFlight) {
+              tab.wheelDispatchInFlight = undefined;
+            }
+            continue;
+          }
+          const nextInput = tab.inputQueue.shift()!;
+          if (nextInput.kind === 'wheel') {
+            const inFlight = this.performWheelDispatch(tab, nextInput.dispatch);
+            tab.wheelDispatchInFlight = inFlight;
+            void inFlight.then(() => {
+              if (tab.wheelDispatchInFlight === inFlight) {
+                tab.wheelDispatchInFlight = undefined;
+              }
+            });
+          } else {
+            nextInput.send().then(nextInput.resolve, nextInput.reject);
+          }
+        }
+      } finally {
+        tab.inputPumpActive = false;
+      }
+    })();
+  }
+
+  private async performWheelDispatch(
+    tab: IPrivateLiveBrowserTab,
+    dispatch: IPendingWheelDispatch,
+  ): Promise<void> {
     try {
-      await cdpSession.send('Input.insertText', { text });
+      await dispatch.cdpSession.send('Input.dispatchMouseEvent', {
+        type: 'mouseWheel',
+        x: dispatch.x,
+        y: dispatch.y,
+        deltaX: dispatch.deltaX,
+        deltaY: dispatch.deltaY,
+        modifiers: dispatch.modifiers,
+        pointerType: 'mouse',
+      });
+      dispatch.resolve();
     } catch (error) {
-      this.handlePossibleCdpDisconnection(tab, cdpSession, error);
-      throw error;
+      this.handlePossibleCdpDisconnection(tab, dispatch.cdpSession, error);
+      dispatch.reject(error);
     }
   }
 
@@ -2276,7 +2560,10 @@ export class LiveBrowserSession {
       tab.securityCdpSession = undefined;
       if (securityCdpSession && !securityCdpSession.detached) {
         try {
-          await securityCdpSession.detach();
+          await this.detachCdpSessionWithTimeout(
+            securityCdpSession,
+            'page security session',
+          );
         } catch {
           // Browser lifetime cancellation may close the target before explicit detach settles.
         }
@@ -2346,11 +2633,18 @@ export class LiveBrowserSession {
     if (!proxyCredentials) {
       try {
         if (denyPermissions) {
-          await cdpSession.send('Browser.grantPermissions', { permissions: [] });
+          await cdpSession.send(
+            'Browser.grantPermissions',
+            { permissions: [] },
+            proxySecurityCommandOptions,
+          );
         }
       } finally {
         if (!cdpSession.detached) {
-          await cdpSession.detach();
+          await this.detachCdpSessionWithTimeout(
+            cdpSession,
+            'browser permission session',
+          );
         }
       }
       return;
@@ -2365,7 +2659,11 @@ export class LiveBrowserSession {
     this.browserSecurityCdpSession = cdpSession;
     try {
       if (denyPermissions) {
-        await cdpSession.send('Browser.grantPermissions', { permissions: [] });
+        await cdpSession.send(
+          'Browser.grantPermissions',
+          { permissions: [] },
+          proxySecurityCommandOptions,
+        );
       }
       const browserSecurityConnection = cdpSession.connection();
       if (!browserSecurityConnection) {
@@ -2373,13 +2671,69 @@ export class LiveBrowserSession {
       }
       this.browserSecurityConnection = browserSecurityConnection;
       this.browserSecuritySessionAttachedListener = (attachedSession) => {
+        const setupPromise = this.configureProxySecuritySession(attachedSession, generation);
+        queueMicrotask(() => {
+          const securityRecord = this.proxySecuritySessions.get(attachedSession.id());
+          if (
+            securityRecord?.generation === generation
+            && securityRecord.ownedByProxySecurity
+          ) {
+            return;
+          }
+          this.trackProxySecurityOperation(
+            setupPromise,
+            generation,
+            'proxy_security_session_setup_failed',
+          );
+        });
+      };
+      this.browserSecurityOwnedSessionAttachedListener = (attachedSession) => {
+        const securityRecord = this.proxySecuritySessions.get(attachedSession.id());
+        if (!securityRecord || securityRecord.generation !== generation) {
+          return;
+        }
+        securityRecord.ownedByProxySecurity = true;
+        this.ownedProxySecuritySessions.add(attachedSession);
+        this.browserSecurityParentOwnedSessions.add(attachedSession);
+        const setupPromise = securityRecord.setupPromise;
+        securityRecord.setupPromise = setupPromise.then(async () => {
+          try {
+            await attachedSession.send(
+              'Runtime.runIfWaitingForDebugger',
+              undefined,
+              proxySecurityCommandOptions,
+            );
+          } catch (error) {
+            this.removeProxySecuritySession(securityRecord);
+            if (attachedSession.detached) {
+              this.forgetOwnedProxySecuritySession(attachedSession);
+              return;
+            }
+            if (this.proxySecurityStopping || this.normalStopRequested) {
+              await this.detachOwnedProxySecuritySession(securityRecord);
+              return;
+            }
+            if (
+              securityRecord.targetId
+              && await this.waitForProxySecurityTargetCoverage(
+                securityRecord.targetId,
+                generation,
+              )
+            ) {
+              await this.detachOwnedProxySecuritySession(securityRecord);
+              return;
+            }
+            throw error;
+          }
+        });
         this.trackProxySecurityOperation(
-          this.configureProxySecuritySession(attachedSession, generation),
+          securityRecord.setupPromise,
           generation,
           'proxy_security_session_setup_failed',
         );
       };
       this.browserSecuritySessionDetachedListener = (detachedSession) => {
+        this.forgetOwnedProxySecuritySession(detachedSession);
         if (detachedSession === cdpSession) {
           this.handleProxySecurityFailure(
             'proxy_security_browser_session_detached',
@@ -2388,6 +2742,14 @@ export class LiveBrowserSession {
           );
           return;
         }
+        if (detachedSession === this.browserSecurityWorkerLifecycleCdpSession) {
+          this.handleProxySecurityFailure(
+            'proxy_security_worker_lifecycle_detached',
+            new Error('Proxy security service-worker lifecycle session detached unexpectedly'),
+            generation,
+          );
+          return;
+        }
         this.trackProxySecurityOperation(
           this.verifyProxySecuritySessionDetached(detachedSession, generation),
           generation,
@@ -2398,11 +2760,30 @@ export class LiveBrowserSession {
         'sessionattached',
         this.browserSecuritySessionAttachedListener,
       );
+      cdpSession.on(
+        plugins.puppeteer.CDPSessionEvent.SessionAttached,
+        this.browserSecurityOwnedSessionAttachedListener,
+      );
       browserSecurityConnection.on(
         'sessiondetached',
         this.browserSecuritySessionDetachedListener,
       );
 
+      await cdpSession.send('Target.setAutoAttach', {
+        autoAttach: true,
+        waitForDebuggerOnStart: true,
+        flatten: true,
+        filter: [
+          { type: 'service_worker' },
+          { exclude: true },
+        ],
+      }, proxySecurityCommandOptions);
+      await Promise.all(
+        [...this.proxySecuritySessions.values()]
+          .filter((record) => record.generation === generation && record.ownedByProxySecurity)
+          .map((record) => record.setupPromise),
+      );
+
       for (const target of browser.targets()) {
         if (!proxySeedTargetTypes.has(target.type())) {
           continue;
@@ -2413,14 +2794,121 @@ export class LiveBrowserSession {
           throw new Error(`Proxy security did not observe session ${securitySession.id()}`);
         }
         securityRecord.ownedByProxySecurity = true;
+        this.ownedProxySecuritySessions.add(securitySession);
         await securityRecord.setupPromise;
       }
+      await this.configureProxySecurityWorkerLifecycle(cdpSession, generation);
     } catch (error) {
       await this.teardownProxySecurity();
       throw error;
     }
   }
 
+  private async configureProxySecurityWorkerLifecycle(
+    browserSecurityCdpSession: plugins.puppeteer.CDPSession,
+    generation: number,
+  ): Promise<void> {
+    const lifecycleUrl = `data:text/html,<title>smartpuppeteer-proxy-security-${generation}</title>`;
+    const { targetId } = await browserSecurityCdpSession.send('Target.createTarget', {
+      url: lifecycleUrl,
+      background: true,
+      hidden: true,
+    }, proxySecurityCommandOptions);
+    const attachedSessions = new Map<string, plugins.puppeteer.CDPSession>();
+    const captureAttachedSession = (session: plugins.puppeteer.CDPSession): void => {
+      attachedSessions.set(session.id(), session);
+    };
+    browserSecurityCdpSession.on(
+      plugins.puppeteer.CDPSessionEvent.SessionAttached,
+      captureAttachedSession,
+    );
+    let lifecycleSession: plugins.puppeteer.CDPSession;
+    try {
+      const { sessionId } = await browserSecurityCdpSession.send('Target.attachToTarget', {
+        targetId,
+        flatten: true,
+      }, proxySecurityCommandOptions);
+      const attachedSession = attachedSessions.get(sessionId);
+      if (!attachedSession) {
+        throw new Error('Proxy security did not observe its hidden lifecycle session');
+      }
+      lifecycleSession = attachedSession;
+    } finally {
+      browserSecurityCdpSession.off(
+        plugins.puppeteer.CDPSessionEvent.SessionAttached,
+        captureAttachedSession,
+      );
+    }
+
+    const securityRecord = this.proxySecuritySessions.get(lifecycleSession.id());
+    if (!securityRecord || !securityRecord.ownedByProxySecurity) {
+      throw new Error('Proxy security did not configure its hidden lifecycle session');
+    }
+    await securityRecord.setupPromise;
+    if (lifecycleSession.detached) {
+      throw new Error('Proxy security hidden lifecycle session detached during setup');
+    }
+
+    this.browserSecurityWorkerLifecycleCdpSession = lifecycleSession;
+    this.browserSecurityWorkerVersionUpdatedListener = (event) => {
+      const stoppedTargetIds = new Set<string>();
+      const redundantTargetIds = new Set<string>();
+      for (const version of event.versions) {
+        if (version.targetId) {
+          if (
+            !this.serviceWorkerTargetIdsByVersionId.has(version.versionId)
+            && this.serviceWorkerTargetIdsByVersionId.size >= maxTrackedServiceWorkerVersions
+          ) {
+            this.handleProxySecurityFailure(
+              'proxy_security_worker_tracking_capacity_exceeded',
+              new Error(
+                `Proxy security exceeded ${maxTrackedServiceWorkerVersions} service-worker versions`,
+              ),
+              generation,
+            );
+            return;
+          }
+          this.serviceWorkerTargetIdsByVersionId.set(version.versionId, version.targetId);
+        }
+        const knownTargetId = version.targetId
+          ?? this.serviceWorkerTargetIdsByVersionId.get(version.versionId);
+        if (version.status === 'redundant' && knownTargetId) {
+          redundantTargetIds.add(knownTargetId);
+        }
+        if (version.runningStatus === 'stopped') {
+          if (knownTargetId) {
+            stoppedTargetIds.add(knownTargetId);
+          }
+          this.serviceWorkerTargetIdsByVersionId.delete(version.versionId);
+        }
+      }
+      for (const workerSecurityRecord of [...this.proxySecuritySessions.values()]) {
+        if (
+          !workerSecurityRecord.ownedByProxySecurity
+          || workerSecurityRecord.targetType !== 'service_worker'
+          || !workerSecurityRecord.targetId
+          || !this.browserSecurityParentOwnedSessions.has(workerSecurityRecord.session)
+        ) {
+          continue;
+        }
+        if (stoppedTargetIds.has(workerSecurityRecord.targetId)) {
+          this.retireOwnedProxySecuritySession(workerSecurityRecord, true);
+        } else if (redundantTargetIds.has(workerSecurityRecord.targetId)) {
+          this.retireOwnedProxySecuritySession(workerSecurityRecord, false);
+        }
+      }
+    };
+    lifecycleSession.on(
+      'ServiceWorker.workerVersionUpdated',
+      this.browserSecurityWorkerVersionUpdatedListener,
+    );
+    await lifecycleSession.send(
+      'ServiceWorker.enable',
+      undefined,
+      proxySecurityCommandOptions,
+    );
+  }
+
   private configureProxySecuritySession(
     session: plugins.puppeteer.CDPSession,
     generation: number,
@@ -2483,7 +2971,7 @@ export class LiveBrowserSession {
         session.send('Fetch.continueWithAuth', {
           requestId: event.requestId,
           authChallengeResponse,
-        }).then(() => undefined),
+        }, proxySecurityCommandOptions).then(() => undefined),
         generation,
         'proxy_security_protocol_failed',
       );
@@ -2516,7 +3004,11 @@ export class LiveBrowserSession {
         }
       }
       this.trackProxySecurityOperation(
-        session.send('Fetch.continueRequest', { requestId: event.requestId }).then(() => undefined),
+        session.send(
+          'Fetch.continueRequest',
+          { requestId: event.requestId },
+          proxySecurityCommandOptions,
+        ).then(() => undefined),
         generation,
         'proxy_security_protocol_failed',
       );
@@ -2528,6 +3020,13 @@ export class LiveBrowserSession {
       }
       requestIdsByNetworkId.delete(networkId);
       attemptedAuthentications.delete(requestId);
+      if (
+        proxySecuritySession.retireWhenIdle
+        && attemptedAuthentications.size === 0
+        && requestIdsByNetworkId.size === 0
+      ) {
+        this.retireOwnedProxySecuritySession(proxySecuritySession, false);
+      }
     };
     const loadingFinishedListener = (event: TNetworkLoadingFinishedEvent): void => {
       forgetAuthentication(event.requestId);
@@ -2546,6 +3045,7 @@ export class LiveBrowserSession {
       fetchEnabled: false,
       allowLiveTargetDetach: false,
       ownedByProxySecurity: false,
+      retireWhenIdle: false,
       attemptedAuthentications,
       requestIdsByNetworkId,
       authRequiredListener,
@@ -2554,12 +3054,20 @@ export class LiveBrowserSession {
       loadingFailedListener,
       setupPromise: Promise.resolve(),
     };
-    const targetInfoPromise = session.send('Target.getTargetInfo');
-    const networkEnablePromise = session.send('Network.enable');
+    const targetInfoPromise = session.send(
+      'Target.getTargetInfo',
+      undefined,
+      proxySecurityCommandOptions,
+    );
+    const networkEnablePromise = session.send(
+      'Network.enable',
+      undefined,
+      proxySecurityCommandOptions,
+    );
     const fetchEnablePromise = session.send('Fetch.enable', {
       handleAuthRequests: true,
       patterns: [{ urlPattern: '*' }],
-    });
+    }, proxySecurityCommandOptions);
     const commandResultsPromise = Promise.allSettled([
       targetInfoPromise,
       networkEnablePromise,
@@ -2590,10 +3098,28 @@ export class LiveBrowserSession {
         proxySecuritySession.fetchEnabled = true;
       } catch (error) {
         this.removeProxySecuritySession(proxySecuritySession);
-        if (session.detached || this.proxySecurityStopping || this.normalStopRequested) {
+        if (session.detached) {
+          this.forgetOwnedProxySecuritySession(session);
           return;
         }
-        throw error;
+        if (this.proxySecurityStopping || this.normalStopRequested) {
+          await this.detachOwnedProxySecuritySession(proxySecuritySession);
+          return;
+        }
+        if (
+          proxySecuritySession.targetId
+          && await this.waitForProxySecurityTargetCoverage(
+            proxySecuritySession.targetId,
+            generation,
+          )
+        ) {
+          await this.detachOwnedProxySecuritySession(proxySecuritySession);
+          return;
+        }
+        throw new Error(
+          `Proxy security ${proxySecuritySession.ownedByProxySecurity ? 'owned' : 'observed'} session setup failed for ${proxySecuritySession.targetType ?? 'unknown'} target ${proxySecuritySession.targetId ?? 'unknown'}: ${normalizeErrorMessage(error)}`,
+          { cause: error },
+        );
       }
     })();
     proxySecuritySession.setupPromise = setupPromise;
@@ -2619,6 +3145,18 @@ export class LiveBrowserSession {
     if (!proxySecuritySession.targetId) {
       throw new Error(`Proxy security session detached before target identification: ${session.id()}`);
     }
+    if (await this.waitForProxySecurityTargetCoverage(proxySecuritySession.targetId, generation)) {
+      return;
+    }
+    throw new Error(
+      `Proxy security detached from live target ${proxySecuritySession.targetId}`,
+    );
+  }
+
+  private async waitForProxySecurityTargetCoverage(
+    targetId: string,
+    generation: number,
+  ): Promise<boolean> {
     for (let attempt = 0; attempt < 3; attempt += 1) {
       const generationSessions = [...this.proxySecuritySessions.values()].filter((candidate) => (
         candidate.generation === generation
@@ -2626,12 +3164,12 @@ export class LiveBrowserSession {
       await Promise.allSettled(generationSessions.map((candidate) => candidate.setupPromise));
       const hasReplacement = [...this.proxySecuritySessions.values()].some((candidate) => (
         candidate.generation === generation
-        && candidate.targetId === proxySecuritySession.targetId
+        && candidate.targetId === targetId
         && candidate.fetchEnabled
         && !candidate.session.detached
       ));
       if (hasReplacement) {
-        return;
+        return true;
       }
       if (attempt < 2) {
         await delay(25);
@@ -2641,12 +3179,12 @@ export class LiveBrowserSession {
     if (!browserSecurityCdpSession || browserSecurityCdpSession.detached) {
       throw new Error('Browser security CDP session detached unexpectedly');
     }
-    const { targetInfos } = await browserSecurityCdpSession.send('Target.getTargets');
-    if (targetInfos.some((targetInfo) => targetInfo.targetId === proxySecuritySession.targetId)) {
-      throw new Error(
-        `Proxy security detached from live target ${proxySecuritySession.targetId}`,
-      );
-    }
+    const { targetInfos } = await browserSecurityCdpSession.send(
+      'Target.getTargets',
+      undefined,
+      proxySecurityCommandOptions,
+    );
+    return !targetInfos.some((targetInfo) => targetInfo.targetId === targetId);
   }
 
   private removeProxySecuritySession(proxySecuritySession: IProxySecuritySession): void {
@@ -2668,6 +3206,113 @@ export class LiveBrowserSession {
     this.proxySecuritySessions.delete(proxySecuritySession.session.id());
   }
 
+  private async detachOwnedProxySecuritySession(
+    proxySecuritySession: IProxySecuritySession,
+  ): Promise<void> {
+    if (!proxySecuritySession.ownedByProxySecurity) {
+      return;
+    }
+    await this.detachTrackedOwnedProxySecuritySession(proxySecuritySession.session);
+  }
+
+  private forgetOwnedProxySecuritySession(session: plugins.puppeteer.CDPSession): void {
+    this.ownedProxySecuritySessions.delete(session);
+    this.browserSecurityParentOwnedSessions.delete(session);
+  }
+
+  private async detachCdpSessionWithTimeout(
+    session: plugins.puppeteer.CDPSession,
+    description: string,
+  ): Promise<void> {
+    let timeout: ReturnType<typeof setTimeout> | undefined;
+    const timeoutPromise = new Promise<never>((_resolve, reject) => {
+      timeout = setTimeout(() => {
+        reject(new Error(
+          `${description} did not detach within ${proxySecurityCommandTimeoutMs}ms`,
+        ));
+      }, proxySecurityCommandTimeoutMs);
+    });
+    try {
+      await Promise.race([session.detach(), timeoutPromise]);
+    } finally {
+      if (timeout) {
+        clearTimeout(timeout);
+      }
+    }
+  }
+
+  private retireOwnedProxySecuritySession(
+    proxySecuritySession: IProxySecuritySession,
+    force: boolean,
+  ): void {
+    if (
+      !proxySecuritySession.ownedByProxySecurity
+      || this.proxySecuritySessions.get(proxySecuritySession.session.id())
+        !== proxySecuritySession
+    ) {
+      return;
+    }
+    proxySecuritySession.retireWhenIdle = true;
+    if (
+      !force
+      && (
+        proxySecuritySession.attemptedAuthentications.size > 0
+        || proxySecuritySession.requestIdsByNetworkId.size > 0
+      )
+    ) {
+      return;
+    }
+    if (proxySecuritySession.targetId) {
+      for (const [versionId, targetId] of this.serviceWorkerTargetIdsByVersionId) {
+        if (targetId === proxySecuritySession.targetId) {
+          this.serviceWorkerTargetIdsByVersionId.delete(versionId);
+        }
+      }
+    }
+    proxySecuritySession.allowLiveTargetDetach = true;
+    this.removeProxySecuritySession(proxySecuritySession);
+    this.trackProxySecurityOperation(
+      this.detachOwnedProxySecuritySession(proxySecuritySession),
+      proxySecuritySession.generation,
+      'proxy_security_worker_retirement_failed',
+    );
+  }
+
+  private async detachTrackedOwnedProxySecuritySession(
+    session: plugins.puppeteer.CDPSession,
+  ): Promise<void> {
+    if (session.detached) {
+      this.forgetOwnedProxySecuritySession(session);
+      return;
+    }
+    try {
+      if (this.browserSecurityParentOwnedSessions.has(session)) {
+        const browserSecurityCdpSession = this.browserSecurityCdpSession;
+        if (!browserSecurityCdpSession || browserSecurityCdpSession.detached) {
+          throw new Error('Browser security parent session is unavailable');
+        }
+        await browserSecurityCdpSession.send('Target.detachFromTarget', {
+          sessionId: session.id(),
+        }, proxySecurityCommandOptions);
+      } else {
+        await this.detachCdpSessionWithTimeout(session, 'proxy security session');
+      }
+      this.forgetOwnedProxySecuritySession(session);
+    } catch (error) {
+      if (session.detached) {
+        this.forgetOwnedProxySecuritySession(session);
+        return;
+      }
+      if (this.proxySecurityStopping || this.normalStopRequested) {
+        return;
+      }
+      throw new Error(
+        `Failed to detach an owned proxy security session: ${normalizeErrorMessage(error)}`,
+        { cause: error },
+      );
+    }
+  }
+
   private allowOperationalCdpSessionDetach(session: plugins.puppeteer.CDPSession): void {
     const proxySecuritySession = this.proxySecuritySessions.get(session.id());
     if (proxySecuritySession) {
@@ -2730,12 +3375,51 @@ export class LiveBrowserSession {
 
   private async teardownProxySecurity(): Promise<void> {
     this.proxySecurityStopping = true;
+    this.serviceWorkerTargetIdsByVersionId.clear();
+    const browserSecurityCdpSession = this.browserSecurityCdpSession;
+    if (browserSecurityCdpSession && !browserSecurityCdpSession.detached) {
+      try {
+        await browserSecurityCdpSession.send('Target.setAutoAttach', {
+          autoAttach: false,
+          waitForDebuggerOnStart: false,
+          flatten: true,
+        }, proxySecurityCommandOptions);
+      } catch {
+        // Browser shutdown may detach the browser target before auto-attach is disabled.
+      }
+    }
+    const workerLifecycleCdpSession = this.browserSecurityWorkerLifecycleCdpSession;
+    if (workerLifecycleCdpSession && !workerLifecycleCdpSession.detached) {
+      try {
+        await workerLifecycleCdpSession.send(
+          'ServiceWorker.disable',
+          undefined,
+          proxySecurityCommandOptions,
+        );
+      } catch {
+        // Browser shutdown can close the hidden lifecycle target first.
+      }
+    }
+    if (workerLifecycleCdpSession && this.browserSecurityWorkerVersionUpdatedListener) {
+      workerLifecycleCdpSession.off(
+        'ServiceWorker.workerVersionUpdated',
+        this.browserSecurityWorkerVersionUpdatedListener,
+      );
+    }
+    this.browserSecurityWorkerVersionUpdatedListener = undefined;
+    this.browserSecurityWorkerLifecycleCdpSession = undefined;
     if (this.browserSecurityConnection && this.browserSecuritySessionAttachedListener) {
       this.browserSecurityConnection.off(
         'sessionattached',
         this.browserSecuritySessionAttachedListener,
       );
     }
+    if (browserSecurityCdpSession && this.browserSecurityOwnedSessionAttachedListener) {
+      browserSecurityCdpSession.off(
+        plugins.puppeteer.CDPSessionEvent.SessionAttached,
+        this.browserSecurityOwnedSessionAttachedListener,
+      );
+    }
     if (this.browserSecurityConnection && this.browserSecuritySessionDetachedListener) {
       this.browserSecurityConnection.off(
         'sessiondetached',
@@ -2743,28 +3427,31 @@ export class LiveBrowserSession {
       );
     }
     this.browserSecuritySessionAttachedListener = undefined;
+    this.browserSecurityOwnedSessionAttachedListener = undefined;
     this.browserSecuritySessionDetachedListener = undefined;
     this.browserSecurityConnection = undefined;
-    const ownedSessions = [...this.proxySecuritySessions.values()]
-      .filter((record) => record.ownedByProxySecurity)
-      .map((record) => record.session);
+    const ownedSessions = [...this.ownedProxySecuritySessions];
     for (const proxySecuritySession of [...this.proxySecuritySessions.values()]) {
       this.removeProxySecuritySession(proxySecuritySession);
     }
     for (const ownedSession of ownedSessions) {
       if (!ownedSession.detached) {
         try {
-          await ownedSession.detach();
+          await this.detachTrackedOwnedProxySecuritySession(ownedSession);
         } catch {
           // Browser shutdown can close a target before explicit detach settles.
         }
       }
     }
-    const browserSecurityCdpSession = this.browserSecurityCdpSession;
+    this.ownedProxySecuritySessions.clear();
+    this.browserSecurityParentOwnedSessions.clear();
     this.browserSecurityCdpSession = undefined;
     if (browserSecurityCdpSession && !browserSecurityCdpSession.detached) {
       try {
-        await browserSecurityCdpSession.detach();
+        await this.detachCdpSessionWithTimeout(
+          browserSecurityCdpSession,
+          'browser security session',
+        );
       } catch {
         // Browser shutdown can detach the browser target first.
       }
@@ -2927,7 +3614,10 @@ export class LiveBrowserSession {
       closing: false,
       stateUpdateQueued: false,
       stateUpdatePending: false,
-      navigationResetPending: false,
+      navigationResetRevision: 0,
+      restoredNavigationRevision: 0,
+      inputQueue: [],
+      inputPumpActive: false,
       removeListeners: [],
     };
     this.tabs.set(tab.id, tab);
@@ -2939,11 +3629,11 @@ export class LiveBrowserSession {
         tab.securityCdpSession = securityCdpSession;
         await securityCdpSession.send('Page.enable', {
           enableFileChooserOpenedEvent: true,
-        });
+        }, proxySecurityCommandOptions);
         await securityCdpSession.send('Page.setInterceptFileChooserDialog', {
           enabled: true,
           cancel: true,
-        });
+        }, proxySecurityCommandOptions);
       }
       await this.ensureTabViewport(tab);
       await this.refreshTab(tab);
@@ -3078,7 +3768,10 @@ export class LiveBrowserSession {
     } catch (error) {
       if (tab.securityCdpSession && !tab.securityCdpSession.detached) {
         try {
-          await tab.securityCdpSession.detach();
+          await this.detachCdpSessionWithTimeout(
+            tab.securityCdpSession,
+            'page security session',
+          );
         } catch {
           // The page may have closed while security setup was failing.
         }
@@ -3117,31 +3810,58 @@ export class LiveBrowserSession {
       return;
     }
     tab.stateUpdatePending = true;
-    tab.navigationResetPending ||= navigationReset;
+    if (navigationReset) {
+      tab.navigationResetRevision += 1;
+    }
     if (tab.stateUpdateQueued) {
       return;
     }
     tab.stateUpdateQueued = true;
     const wasScheduled = this.scheduleOperation(async () => {
       try {
-        const shouldResetNavigation = tab.navigationResetPending;
+        const navigationResetRevision = tab.navigationResetRevision;
+        const shouldResetNavigation = (
+          tab.restoredNavigationRevision < navigationResetRevision
+        );
         tab.stateUpdatePending = false;
-        tab.navigationResetPending = false;
         if (!this.tabs.has(tab.id) || tab.closing) {
           return;
         }
         if (shouldResetNavigation && this.activeTabId === tab.id) {
           await this.stopScreencast(tab);
         }
-        await this.refreshTab(tab);
-        this.emitState();
+        let stateUpdateError: unknown;
+        try {
+          await this.refreshTab(tab);
+          this.emitState();
+        } catch (error) {
+          stateUpdateError = error;
+        }
         if (
           shouldResetNavigation
           && this.activeTabId === tab.id
           && this.status === 'running'
           && tab.status === 'open'
         ) {
-          await this.startScreencast(tab);
+          try {
+            await this.startScreencast(tab);
+          } catch (error) {
+            throw stateUpdateError
+              ? new AggregateError(
+                  [stateUpdateError, error],
+                  'Page state refresh and screencast restart failed',
+                )
+              : error;
+          }
+        }
+        if (shouldResetNavigation) {
+          tab.restoredNavigationRevision = Math.max(
+            tab.restoredNavigationRevision,
+            navigationResetRevision,
+          );
+        }
+        if (stateUpdateError) {
+          throw stateUpdateError;
         }
       } finally {
         tab.stateUpdateQueued = false;
@@ -3346,15 +4066,32 @@ export class LiveBrowserSession {
     } finally {
       tab.navigationInProgress = false;
       if (this.tabs.has(tab.id) && !tab.page.isClosed()) {
-        await this.refreshTab(tab);
-        this.emitState();
+        let stateUpdateError: unknown;
+        try {
+          await this.refreshTab(tab);
+          this.emitState();
+        } catch (error) {
+          stateUpdateError = error;
+        }
         if (
           isActive
           && this.activeTabId === tab.id
           && this.status === 'running'
           && tab.status === 'open'
         ) {
-          await this.startScreencast(tab);
+          try {
+            await this.startScreencast(tab);
+          } catch (error) {
+            throw stateUpdateError
+              ? new AggregateError(
+                  [stateUpdateError, error],
+                  'Navigation state refresh and screencast restart failed',
+                )
+              : error;
+          }
+        }
+        if (stateUpdateError) {
+          throw stateUpdateError;
         }
       }
     }
@@ -4271,50 +5008,4 @@ export class LiveBrowserSession {
     return validatedWaitUntil;
   }
 
-  private validateScreencastOptions(): void {
-    const options = this.options.screencast;
-    if (!options) {
-      return;
-    }
-    if (options.format !== undefined && options.format !== 'jpeg' && options.format !== 'png') {
-      throw new Error('screencast.format must be jpeg or png');
-    }
-    if (options.quality !== undefined) {
-      validateInteger(options.quality, 'screencast.quality', 0, 100);
-    }
-    if (options.maxWidth !== undefined) {
-      validateInteger(options.maxWidth, 'screencast.maxWidth', 1, maxViewportWidth);
-    }
-    if (options.maxHeight !== undefined) {
-      validateInteger(options.maxHeight, 'screencast.maxHeight', 1, maxViewportHeight);
-    }
-    if (
-      options.maxWidth !== undefined
-      && options.maxHeight !== undefined
-      && options.maxWidth * options.maxHeight > maxViewportPixelArea
-    ) {
-      throw new Error(
-        `screencast pixel area must not exceed ${maxViewportPixelArea} pixels`,
-      );
-    }
-    if (options.everyNthFrame !== undefined) {
-      validateInteger(options.everyNthFrame, 'screencast.everyNthFrame', 1, 100);
-    }
-    if (options.maxOutstandingFrames !== undefined) {
-      validateInteger(
-        options.maxOutstandingFrames,
-        'screencast.maxOutstandingFrames',
-        1,
-        liveBrowserMaxOutstandingFrames,
-      );
-    }
-    if (options.firstFrameTimeoutMs !== undefined) {
-      validateInteger(
-        options.firstFrameTimeoutMs,
-        'screencast.firstFrameTimeoutMs',
-        100,
-        maxTimeoutMs,
-      );
-    }
-  }
 }