@@ -32,7 +32,7 @@ import * as SqlitePersistence from "../persistence/Sqlite.ts";
3232import * as ServerConfig from "../config.ts" ;
3333import * as ServerSettings from "../serverSettings.ts" ;
3434import * as GitWorkflow from "../git/GitWorkflowService.ts" ;
35- import { withWorkspaceLease } from "../workspace/workspaceLease.ts" ;
35+ import { withTurnStartReservation , withWorkspaceLease } from "../workspace/workspaceLease.ts" ;
3636import { ProviderWorkspaceMissingError } from "../provider/Errors.ts" ;
3737import { resolveCodexRollbackTurnCount } from "./Adapters/CodexAdapterV2.ts" ;
3838import * as CheckpointService from "./CheckpointService.ts" ;
@@ -347,6 +347,118 @@ it.effect.each([
347347 } ) . pipe ( Effect . scoped , Effect . provide ( NodeServices . layer ) ) ,
348348) ;
349349
350+ it . effect . each ( [ { restoreFiles : true } , { restoreFiles : false } ] ) (
351+ "holds turn starts inside the worktree during rollback with restoreFiles $restoreFiles" ,
352+ ( { restoreFiles } ) =>
353+ Effect . gen ( function * ( ) {
354+ const fileSystem = yield * FileSystem . FileSystem ;
355+ const path = yield * Path . Path ;
356+ const workspaceRoot = yield * fileSystem . realPath (
357+ yield * fileSystem . makeTempDirectoryScoped ( { prefix : "t3-rollback-reservation-" } ) ,
358+ ) ;
359+ const worktreesDir = path . join ( workspaceRoot , "worktrees" ) ;
360+ const worktreePath = path . join ( worktreesDir , "repo" , "feature" ) ;
361+ yield * fileSystem . makeDirectory ( worktreePath , { recursive : true } ) ;
362+ const threadId = ThreadId . make ( "rollback-reservation" ) ;
363+ const providerThreadId = ProviderThreadId . make ( "rollback-reservation-provider-thread" ) ;
364+ const providerInstanceId = ProviderInstanceId . make ( "rollback-reservation-provider" ) ;
365+ const checkpointId = CheckpointId . make ( "rollback-reservation-checkpoint" ) ;
366+ const scopeId = CheckpointScopeId . make ( "rollback-reservation-scope" ) ;
367+ const release = Deferred . makeUnsafe < void > ( ) ;
368+ const openEntered = Deferred . makeUnsafe < void > ( ) ;
369+ const calls : string [ ] = [ ] ;
370+ const projection = {
371+ thread : {
372+ id : threadId ,
373+ projectId : ProjectId . make ( "rollback-reservation-project" ) ,
374+ worktreePath,
375+ branch : "feature/rollback-reservation" ,
376+ activeProviderThreadId : providerThreadId ,
377+ modelSelection : { instanceId : providerInstanceId , model : "test-model" } ,
378+ } ,
379+ providerThread : {
380+ id : providerThreadId ,
381+ providerSessionId : ProviderSessionId . make ( "rollback-reservation-session" ) ,
382+ providerInstanceId,
383+ } ,
384+ providerSession : undefined ,
385+ checkpoint : { id : checkpointId , scopeId, status : "ready" , appRunOrdinal : 0 } ,
386+ scope : { id : scopeId , cwd : worktreePath } ,
387+ runsToRollback : [ ] ,
388+ targetAttempt : undefined ,
389+ rolledBackAttemptIds : [ ] ,
390+ staleCheckpoints : [ ] ,
391+ rootNodes : [ ] ,
392+ providerTurns : [ ] ,
393+ } as unknown as ProjectionStore . ProjectionCheckpointRollbackContext ;
394+ const testLayer = CheckpointRollbackService . layer . pipe (
395+ Layer . provide (
396+ Layer . mergeAll (
397+ ThreadCommandExecutor . layer ,
398+ NodeServices . layer ,
399+ Layer . mock ( ServerConfig . ServerConfig ) ( { worktreesDir } as never ) ,
400+ ServerSettings . layerTest ( ) ,
401+ Layer . mock ( ProjectStore . ProjectStoreV2 ) ( {
402+ get : ( ) => Effect . succeed ( Option . some ( { workspaceRoot } as never ) ) ,
403+ } ) ,
404+ Layer . mock ( GitWorkflow . GitWorkflowService ) ( { } ) ,
405+ Layer . mock ( CheckpointService . CheckpointServiceV2 ) ( {
406+ restore : ( ) => Effect . sync ( ( ) => calls . push ( "files" ) ) ,
407+ } ) ,
408+ Layer . mock ( EventSink . EventSinkV2 ) ( { write : ( ) => Effect . succeed ( [ ] ) } ) ,
409+ IdAllocator . layer ,
410+ Layer . mock ( ProjectionStore . ProjectionStoreV2 ) ( {
411+ getThread : ( ) => Effect . succeed ( projection . thread ) ,
412+ getCheckpointRollbackContext : ( ) => Effect . succeed ( projection ) ,
413+ getShellSnapshot : ( ) =>
414+ Effect . succeed ( {
415+ schemaVersion : 1 ,
416+ snapshotSequence : 0 ,
417+ threads : [ ] ,
418+ archivedThreads : [ ] ,
419+ } ) ,
420+ } ) ,
421+ Layer . mock ( ProviderSessionManager . ProviderSessionManagerV2 ) ( {
422+ open : ( ) =>
423+ Deferred . succeed ( openEntered , undefined ) . pipe (
424+ Effect . andThen ( Deferred . await ( release ) ) ,
425+ Effect . as ( { } as never ) ,
426+ ) ,
427+ } ) ,
428+ Layer . mock ( RuntimePolicy . RuntimePolicyV2 ) ( {
429+ resolve : ( ) => Effect . succeed ( { cwd : worktreePath } as never ) ,
430+ } ) ,
431+ ) ,
432+ ) ,
433+ ) ;
434+ yield * Effect . gen ( function * ( ) {
435+ const service = yield * CheckpointRollbackService . CheckpointRollbackServiceV2 ;
436+ const rollback = yield * service
437+ . execute ( { threadId, providerThreadId, checkpointId, scopeId, restoreFiles } )
438+ . pipe ( Effect . forkChild ( { startImmediately : true } ) ) ;
439+ yield * Deferred . await ( openEntered ) ;
440+ // A synchronous realPath lets the forked start reach the reservation
441+ // before the next assertion, so "not entered" means "waiting".
442+ const turnStart = yield * withTurnStartReservation (
443+ FileSystem . makeNoop ( { realPath : ( target ) => Effect . succeed ( target ) } ) ,
444+ path ,
445+ path . join ( worktreePath , "packages" , "app" ) ,
446+ Effect . sync ( ( ) => calls . push ( "turn start" ) ) ,
447+ ) . pipe ( Effect . forkChild ( { startImmediately : true } ) ) ;
448+ if ( restoreFiles ) {
449+ assert . deepEqual ( calls , [ ] ) ;
450+ } else {
451+ // Nothing is rewritten, so the turn start must not wait for the provider.
452+ yield * Fiber . join ( turnStart ) ;
453+ }
454+ yield * Deferred . succeed ( release , undefined ) ;
455+ yield * Fiber . join ( rollback ) ;
456+ yield * Fiber . join ( turnStart ) ;
457+ assert . deepEqual ( calls , restoreFiles ? [ "files" , "turn start" ] : [ "turn start" ] ) ;
458+ } ) . pipe ( Effect . provide ( testLayer ) ) ;
459+ } ) . pipe ( Effect . scoped , Effect . provide ( NodeServices . layer ) ) ,
460+ ) ;
461+
350462const seedRollbackHistory = Effect . gen ( function * ( ) {
351463 const store = yield * ProjectionStore . ProjectionStoreV2 ;
352464 const now = yield * DateTime . now ;
0 commit comments