@@ -310,11 +310,15 @@ interface ServerTab {
310310 readonly openerTabId : string | undefined ;
311311 /** Finished downloads, newest last; files live until the tab closes. */
312312 readonly downloads : Array < ServerDownload > ;
313- /** A page's open file picker, waiting for the controlling viewer's files. */
313+ /**
314+ * A page's open file picker, waiting for the controlling viewer's files. Its
315+ * id is reissued for each viewer it is offered to, so only that viewer can answer.
316+ */
314317 fileChooser : {
315318 readonly id : string ;
316319 readonly chooser : FileChooser ;
317320 readonly accept : string ;
321+ readonly offeredTo : string | null ;
318322 } | null ;
319323 dialog : Dialog | null ;
320324 setting : PreviewViewportSetting ;
@@ -1027,14 +1031,27 @@ const make = Effect.gen(function* () {
10271031 . catch ( ( ) => null ) ) ?? "" ;
10281032 // A newer picker replaces an unanswered one, as a real browser allows only one.
10291033 if ( previous ) closeFileChooser ( tab ) ;
1030- tab . fileChooser = { id : NodeCrypto . randomUUID ( ) , chooser, accept : accept . slice ( 0 , 1024 ) } ;
1034+ tab . fileChooser = {
1035+ id : NodeCrypto . randomUUID ( ) ,
1036+ chooser,
1037+ accept : accept . slice ( 0 , 1024 ) ,
1038+ offeredTo : null ,
1039+ } ;
10311040 pushFileChooser ( tab ) ;
10321041 } ;
10331042
10341043 const pushFileChooser = ( tab : ServerTab ) => {
1035- const message = fileChooserMessage ( tab ) ;
1044+ const open = tab . fileChooser ;
10361045 const controller = [ ...tab . viewers ] . find ( ( viewer ) => viewer . id === tab . control . controller ) ;
1037- if ( message ) controller ?. push ( message ) ;
1046+ if ( ! open || ! controller ) return ;
1047+ if ( open . offeredTo !== controller . id ) {
1048+ // A new controller gets a fresh id; the previous one can no longer answer.
1049+ tab . fileChooser = { ...open , id : NodeCrypto . randomUUID ( ) , offeredTo : controller . id } ;
1050+ if ( open . offeredTo !== null )
1051+ for ( const viewer of tab . viewers ) viewer . push ( { _tag : "fileChooserClosed" , id : open . id } ) ;
1052+ }
1053+ const message = fileChooserMessage ( tab ) ;
1054+ if ( message ) controller . push ( message ) ;
10381055 } ;
10391056
10401057 const closeFileChooser = ( tab : ServerTab ) => {
@@ -1050,7 +1067,14 @@ const make = Effect.gen(function* () {
10501067 ) => {
10511068 const tab = tabs . get ( tabKey ( input . threadId , input . tabId ) ) ;
10521069 const open = tab ?. fileChooser ;
1053- if ( ! tab || ! open || open . id !== input . chooserId ) return false ;
1070+ if (
1071+ ! tab ||
1072+ ! open ||
1073+ open . id !== input . chooserId ||
1074+ open . offeredTo === null ||
1075+ open . offeredTo !== tab . control . controller
1076+ )
1077+ return false ;
10541078 if ( input . files . length > 0 ) {
10551079 await open . chooser . setFiles (
10561080 open . chooser . isMultiple ( ) ? [ ...input . files ] : input . files . slice ( 0 , 1 ) ,
0 commit comments