@@ -185,6 +185,8 @@ interface ViewerState {
185185 readonly resume : ( ) => Promise < void > ;
186186 /** Last wheel input from this viewer, for motion mode. */
187187 scrolledAt : number ;
188+ /** Panel bounds, retained in fixed mode; passive viewers never request a size. */
189+ requestedSize : { width : number ; height : number ; order : number } | null ;
188190}
189191
190192interface Recording {
@@ -257,6 +259,7 @@ const make = Effect.gen(function* () {
257259 const pendingTabs = new Map < string , Promise < ServerTab > > ( ) ;
258260 const contexts = new Map < string , Promise < BrowserContext > > ( ) ;
259261 let hostConnectionId : string | null = null ;
262+ let viewerResizeOrder = 0 ;
260263
261264 const profilesDir = NodePath . join ( config . stateDir , "server-browser" , "profiles" ) ;
262265
@@ -373,8 +376,13 @@ const make = Effect.gen(function* () {
373376
374377 const applySetting = async ( tab : ServerTab , setting : PreviewViewportSetting ) => {
375378 tab . setting = setting ;
376- const size = fixedViewportSize ( setting ) ;
377- if ( size ) await tab . page . setViewportSize ( size ) ;
379+ const size =
380+ fixedViewportSize ( setting ) ??
381+ [ ...tab . viewers ]
382+ . map ( ( viewer ) => viewer . requestedSize )
383+ . filter ( ( requested ) => requested !== null )
384+ . sort ( ( left , right ) => right . order - left . order ) [ 0 ] ;
385+ if ( size ) await tab . page . setViewportSize ( { width : size . width , height : size . height } ) ;
378386 broadcastViewport ( tab ) ;
379387 } ;
380388
@@ -853,19 +861,32 @@ const make = Effect.gen(function* () {
853861 reuse && request . tabId !== undefined
854862 ? tabs . get ( tabKey ( request . threadId , request . tabId ) )
855863 : undefined ;
864+ const reveal = open . open ?? open . show ;
865+ const revealTab = async ( tab : ServerTab ) => {
866+ if ( reveal === false ) return ;
867+ await Effect . runPromise (
868+ manager . requestReveal ( {
869+ threadId : tab . threadId ,
870+ tabId : tab . tabId ,
871+ force : reveal === true ,
872+ } ) ,
873+ ) ;
874+ } ;
856875 if ( existing ) {
857876 if ( url ) await navigate ( existing , url , "load" , request . timeoutMs ) ;
877+ await revealTab ( existing ) ;
858878 return statusWithTitle ( existing ) ;
859879 }
860880 const snapshot = await Effect . runPromise (
861881 manager . open ( {
862882 threadId : request . threadId ,
863883 ...( url ? { url } : { } ) ,
864884 runtime : "server" ,
865- reveal : ( open . open ?? open . show ) !== false ,
885+ reveal : false ,
866886 } ) ,
867887 ) ;
868888 const tab = await ensureTab ( snapshot ) ;
889+ await revealTab ( tab ) ;
869890 if ( url ) {
870891 await tab . page
871892 . waitForLoadState ( "load" , { timeout : request . timeoutMs } )
@@ -963,14 +984,15 @@ const make = Effect.gen(function* () {
963984 return { tabId : tab . tabId , recording : true , startedAt : recording . startedAt } ;
964985 }
965986 case "recordingStop" : {
987+ const recordings = [ ...tabs . values ( ) ] . filter (
988+ ( candidate ) =>
989+ candidate . threadId === request . threadId &&
990+ ( candidate . recording || candidate . recordingStart ) ,
991+ ) ;
992+ const targetTabId = request . tabId ?? latestThreadTab ( request . threadId ) ?. tabId ;
966993 const tab =
967- request . tabId === undefined
968- ? [ ...tabs . values ( ) ] . find (
969- ( candidate ) =>
970- candidate . threadId === request . threadId &&
971- ( candidate . recording || candidate . recordingStart ) ,
972- )
973- : await requireTab ( request ) ;
994+ recordings . find ( ( candidate ) => candidate . tabId === targetTabId ) ??
995+ ( ! request . tabIdExplicit && recordings . length === 1 ? recordings [ 0 ] : undefined ) ;
974996 if ( ! tab ) {
975997 throw new ServerBrowserPage . ServerBrowserOperationError (
976998 "PreviewAutomationRecordingNotActiveError" ,
@@ -1090,15 +1112,14 @@ const make = Effect.gen(function* () {
10901112 }
10911113 return ;
10921114 case "resize" : {
1093- const width = Math . round ( num ( message . width ) ) ;
1094- const height = Math . round ( num ( message . height ) ) ;
1095- if ( tab . setting . _tag !== "fill" || width < 100 || height < 100 ) return ;
1115+ const width = Math . min ( Math . round ( num ( message . width ) ) , 3840 ) ;
1116+ const height = Math . min ( Math . round ( num ( message . height ) ) , 2160 ) ;
1117+ if ( width < 100 || height < 100 ) return ;
1118+ viewer . requestedSize = { width, height, order : ++ viewerResizeOrder } ;
1119+ if ( tab . setting . _tag !== "fill" ) return ;
10961120 const current = tab . page . viewportSize ( ) ;
10971121 if ( current ?. width === width && current . height === height ) return ;
1098- await tab . page . setViewportSize ( {
1099- width : Math . min ( width , 3840 ) ,
1100- height : Math . min ( height , 2160 ) ,
1101- } ) ;
1122+ await tab . page . setViewportSize ( { width, height } ) ;
11021123 broadcastViewport ( tab ) ;
11031124 return ;
11041125 }
@@ -1194,6 +1215,7 @@ const make = Effect.gen(function* () {
11941215 } ,
11951216 resume : ( ) => startScreencast ( screencastScale ) ,
11961217 scrolledAt : 0 ,
1218+ requestedSize : null ,
11971219 } ;
11981220 yield * Effect . acquireRelease (
11991221 Effect . sync ( ( ) => {
0 commit comments