@@ -331,6 +331,7 @@ const layerProjectDeletionTest = Layer.mergeAll(
331331 RuntimeLayer . layer . pipe ( Layer . provide ( RuntimeLayer . layerProjectService ) ) ,
332332 RuntimeLayer . layerProjectService ,
333333 RuntimeLayer . layerEventSink ,
334+ ProjectionStore . layer ,
334335 ThreadCommandExecutor . layer ,
335336) . pipe (
336337 Layer . provide (
@@ -592,6 +593,129 @@ it.layer(layerProjectDeletionTest)("project deletion during thread commands", (i
592593 ) ;
593594 } ) ,
594595 ) ;
596+
597+ // Deleting a thread reads whether other threads still show its pages, so a second
598+ // deletion must not plan against a first one that has not committed yet.
599+ it . effect ( "plans a thread deletion only after an in-flight deletion commits" , ( ) =>
600+ Effect . gen ( function * ( ) {
601+ const projects = yield * ProjectService . ProjectService ;
602+ const orchestrator = yield * Orchestrator . OrchestratorV2 ;
603+ const eventSink = yield * EventSink . EventSinkV2 ;
604+ const projectionStore = yield * ProjectionStore . ProjectionStoreV2 ;
605+ const executor = yield * ThreadCommandExecutor . ThreadCommandExecutor ;
606+ const threadProjectId = ProjectId . make ( "runtime-delete-serial-thread-project" ) ;
607+ const deletedProjectId = ProjectId . make ( "runtime-delete-serial-project" ) ;
608+ const threadId = ThreadId . make ( "runtime-delete-serial-thread" ) ;
609+ const projectThreadId = ThreadId . make ( "runtime-delete-serial-project-thread" ) ;
610+ const threadDeleteId = CommandId . make ( "runtime-delete-serial-thread-delete" ) ;
611+ for ( const [ projectId , threadIdInProject ] of [
612+ [ threadProjectId , threadId ] ,
613+ [ deletedProjectId , projectThreadId ] ,
614+ ] as const ) {
615+ yield * projects . create ( {
616+ commandId : CommandId . make ( `runtime-delete-serial-create:${ projectId } ` ) ,
617+ projectId,
618+ title : "Serial deletion" ,
619+ workspaceRoot : `/work/serial-deletion/${ projectId } ` ,
620+ } ) ;
621+ yield * orchestrator . dispatch ( {
622+ type : "thread.create" ,
623+ commandId : CommandId . make ( `runtime-delete-serial-create:${ threadIdInProject } ` ) ,
624+ createdBy : "user" ,
625+ creationSource : "web" ,
626+ threadId : threadIdInProject ,
627+ projectId,
628+ title : "Serial deletion" ,
629+ modelSelection,
630+ runtimeMode : "full-access" ,
631+ interactionMode : "default" ,
632+ branch : null ,
633+ worktreePath : null ,
634+ } ) ;
635+ }
636+
637+ const threadDeleteReady = yield * Deferred . make < void > ( ) ;
638+ const releaseThreadDelete = yield * Deferred . make < void > ( ) ;
639+ const projectDeleteQueued = yield * Deferred . make < void > ( ) ;
640+ const projectDeletePlanning = yield * Deferred . make < void > ( ) ;
641+ let threadDeleteCommitted = false ;
642+ const projectDeletePlannedAfterCommit : Array < boolean > = [ ] ;
643+ const commitCommand = eventSink . commitCommand ;
644+ const commitSpy = vi . spyOn ( eventSink , "commitCommand" ) . mockImplementation ( ( input ) =>
645+ input . commandId === threadDeleteId
646+ ? Deferred . succeed ( threadDeleteReady , undefined ) . pipe (
647+ Effect . andThen ( Deferred . await ( releaseThreadDelete ) ) ,
648+ Effect . andThen ( commitCommand ( input ) ) ,
649+ Effect . tap ( ( ) =>
650+ Effect . sync ( ( ) => {
651+ threadDeleteCommitted = true ;
652+ } ) ,
653+ ) ,
654+ )
655+ : commitCommand ( input ) ,
656+ ) ;
657+ const getThreadAttachmentIds = projectionStore . getThreadAttachmentIds ;
658+ const readSpy = vi
659+ . spyOn ( projectionStore , "getThreadAttachmentIds" )
660+ . mockImplementation ( ( id ) =>
661+ id === projectThreadId
662+ ? Effect . sync ( ( ) => projectDeletePlannedAfterCommit . push ( threadDeleteCommitted ) ) . pipe (
663+ Effect . andThen ( Deferred . succeed ( projectDeletePlanning , undefined ) ) ,
664+ Effect . andThen ( getThreadAttachmentIds ( id ) ) ,
665+ )
666+ : getThreadAttachmentIds ( id ) ,
667+ ) ;
668+ const withDeletionLock = executor . withDeletionLock ;
669+ let deletionLockRequests = 0 ;
670+ const observeDeletionLock : ThreadCommandExecutor . ThreadCommandExecutor [ "Service" ] [ "withDeletionLock" ] =
671+ ( effect ) =>
672+ ++ deletionLockRequests === 2
673+ ? Deferred . succeed ( projectDeleteQueued , undefined ) . pipe (
674+ Effect . andThen ( withDeletionLock ( effect ) ) ,
675+ )
676+ : withDeletionLock ( effect ) ;
677+ const lockSpy = vi
678+ . spyOn ( executor , "withDeletionLock" )
679+ . mockImplementation ( observeDeletionLock ) ;
680+ yield * Effect . gen ( function * ( ) {
681+ const threadDeleteFiber = yield * orchestrator
682+ . dispatch ( { type : "thread.delete" , commandId : threadDeleteId , threadId } )
683+ . pipe ( Effect . forkChild ( { startImmediately : true } ) ) ;
684+ yield * Effect . raceFirst (
685+ Deferred . await ( threadDeleteReady ) ,
686+ Fiber . join ( threadDeleteFiber ) . pipe (
687+ Effect . andThen ( Effect . die ( "The thread deletion completed before its commit barrier." ) ) ,
688+ ) ,
689+ ) ;
690+ const projectDeleteFiber = yield * projects
691+ . delete ( {
692+ commandId : CommandId . make ( "runtime-delete-serial-project-delete" ) ,
693+ projectId : deletedProjectId ,
694+ force : true ,
695+ } )
696+ . pipe ( Effect . forkChild ( { startImmediately : true } ) ) ;
697+ yield * Effect . raceFirst (
698+ Deferred . await ( projectDeleteQueued ) ,
699+ Deferred . await ( projectDeletePlanning ) ,
700+ ) ;
701+ yield * Deferred . succeed ( releaseThreadDelete , undefined ) ;
702+ yield * Fiber . join ( threadDeleteFiber ) ;
703+ yield * Fiber . join ( projectDeleteFiber ) ;
704+ assert . deepEqual ( projectDeletePlannedAfterCommit , [ true ] ) ;
705+ assert . isNotNull (
706+ ( yield * orchestrator . getThreadProjection ( projectThreadId ) ) . thread . deletedAt ,
707+ ) ;
708+ } ) . pipe (
709+ Effect . ensuring (
710+ Effect . sync ( ( ) => {
711+ commitSpy . mockRestore ( ) ;
712+ readSpy . mockRestore ( ) ;
713+ lockSpy . mockRestore ( ) ;
714+ } ) ,
715+ ) ,
716+ ) ;
717+ } ) ,
718+ ) ;
595719} ) ;
596720
597721const layerSharedApplicationDataPlaneTest = Layer . mergeAll (
0 commit comments