@@ -7,6 +7,7 @@ import { projectEnvironment } from "~/state/projects";
77import { environmentSession , readEnvironmentScope , sessionHasScope } from "~/state/session" ;
88
99import { FileSaveCoordinator } from "./fileSaveCoordinator" ;
10+ import { guardFileSaveSessionFork , resumeFileSaveSessionFork } from "./fileSaveSessionGuard.fork" ; // fork-hook: upstream-fixes/stale-write-guard-import
1011import {
1112 confirmProjectFileQueryData ,
1213 getUnsavedProjectFileQueryData ,
@@ -21,6 +22,7 @@ export interface FileSaveTarget {
2122export type FilePendingListener = ( relativePath : string , pending : boolean ) => void ;
2223
2324export interface FileSaveSessionDeps {
25+ readonly guardFork ?: typeof guardFileSaveSessionFork ; // fork-hook: upstream-fixes/stale-write-guard-contract
2426 readonly debounceMs : number ;
2527 readonly canPersist : ( target : FileSaveTarget ) => boolean ;
2628 /** Calls `onWritable` each time the target environment regains write access. */
@@ -69,6 +71,7 @@ export function createFileSaveSessions(deps: FileSaveSessionDeps) {
6971 for ( const listener of listeners . keys ( ) ) listener ( target . relativePath , pending ) ;
7072 } ,
7173 persist : ( contents ) => deps . persist ( target , contents ) ,
74+ ...deps . guardFork ?.( target , ( ) => ( sessions . get ( key ) === session ? coordinator : null ) ) , // fork-hook: upstream-fixes/stale-write-guard
7275 onConfirmed : ( contents ) => deps . confirm ( target , contents ) ,
7376 onSettled : ( ) => {
7477 if ( ! session . flushingOnRelease ) return ;
@@ -130,6 +133,7 @@ export function createFileSaveSessions(deps: FileSaveSessionDeps) {
130133 /** Edits for a file nobody holds open are dropped, so retired editors stay inert. */
131134 change ( target : FileSaveTarget , contents : string ) : void {
132135 const session = sessions . get ( fileSaveKey ( target ) ) ;
136+ resumeFileSaveSessionFork ( session ) ; // fork-hook: upstream-fixes/stale-write-session-resume
133137 if ( session && session . leases > 0 ) session . coordinator . change ( contents ) ;
134138 } ,
135139 } ;
@@ -140,6 +144,7 @@ function fileSaveKey({ environmentId, cwd, relativePath }: FileSaveTarget): stri
140144}
141145
142146const fileSaveSessions = createFileSaveSessions ( {
147+ guardFork : guardFileSaveSessionFork , // fork-hook: upstream-fixes/stale-write-session-persist
143148 debounceMs : 500 ,
144149 canPersist : ( { environmentId } ) => readEnvironmentScope ( environmentId , AuthFilesystemWriteScope ) ,
145150 subscribeWritable : ( { environmentId } , onWritable ) => {
0 commit comments