@@ -174,7 +174,10 @@ it.effect.each([
174174 { order : "cleanup-first" , restoreFiles : true } ,
175175 { order : "rollback-first" , restoreFiles : true } ,
176176 { order : "cleanup-first" , restoreFiles : false , unmanaged : true } ,
177- ] ) ( "locks rollback with %s" , ( { order, restoreFiles, unmanaged = false } ) =>
177+ { order : "cleanup-first" , restoreFiles : true , leavesFolder : true } ,
178+ { order : "cleanup-first" , restoreFiles : false , leavesFolder : true } ,
179+ { order : "cleanup-first" , restoreFiles : true , leavesFolder : true , shared : true } ,
180+ ] ) ( "locks rollback with %s" , ( { order, restoreFiles, unmanaged, leavesFolder, shared } ) =>
178181 Effect . gen ( function * ( ) {
179182 const fileSystem = yield * FileSystem . FileSystem ;
180183 const path = yield * Path . Path ;
@@ -185,7 +188,7 @@ it.effect.each([
185188 const worktreePath = unmanaged
186189 ? path . join ( workspaceRoot , "elsewhere" , "feature" )
187190 : path . join ( worktreesDir , "repo" , "feature" ) ;
188- yield * fileSystem . makeDirectory ( worktreePath , { recursive : true } ) ;
191+ yield * fileSystem . makeDirectory ( path . join ( worktreePath , ".git" ) , { recursive : true } ) ;
189192 const threadId = ThreadId . make ( "rollback-worktree" ) ;
190193 const projectId = ProjectId . make ( "rollback-worktree-project" ) ;
191194 const providerThreadId = ProviderThreadId . make ( "rollback-worktree-provider-thread" ) ;
@@ -246,14 +249,18 @@ it.effect.each([
246249 path : worktreePath ,
247250 } ) ;
248251 calls . push ( "create" ) ;
249- yield * fileSystem . makeDirectory ( worktreePath ) . pipe ( Effect . orDie ) ;
252+ yield * fileSystem
253+ . makeDirectory ( path . join ( worktreePath , ".git" ) , { recursive : true } )
254+ . pipe ( Effect . orDie ) ;
250255 return { } as never ;
251256 } ) ,
252257 } ) ,
253258 Layer . mock ( CheckpointService . CheckpointServiceV2 ) ( {
254259 restore : ( ) =>
255260 Effect . gen ( function * ( ) {
256- assert . isTrue ( yield * fileSystem . exists ( worktreePath ) . pipe ( Effect . orDie ) ) ;
261+ assert . isTrue (
262+ yield * fileSystem . exists ( path . join ( worktreePath , ".git" ) ) . pipe ( Effect . orDie ) ,
263+ ) ;
257264 calls . push ( "files" ) ;
258265 } ) ,
259266 } ) ,
@@ -272,16 +279,31 @@ it.effect.each([
272279 Effect . succeed ( {
273280 schemaVersion : 1 ,
274281 snapshotSequence : 0 ,
275- threads : [ ] ,
282+ threads : shared
283+ ? [
284+ {
285+ id : ThreadId . make ( "rollback-worktree-sharer" ) ,
286+ projectId,
287+ worktreePath,
288+ deletedAt : null ,
289+ lineage : { } ,
290+ } ,
291+ ]
292+ : [ ] ,
276293 archivedThreads : [ ] ,
277- } ) ,
294+ } as never ) ,
295+ getCheckpointContext : ( ) => Effect . succeed ( { checkpointScopes : [ ] } as never ) ,
296+ getThreadProviderContext : ( ) => Effect . succeed ( { providerSessions : [ ] } as never ) ,
278297 } ) ,
279298 Layer . mock ( ProviderSessionManager . ProviderSessionManagerV2 ) ( {
280299 open : ( input ) =>
281300 Effect . gen ( function * ( ) {
282301 assert . equal ( input . runtimePolicy . cwd , worktreePath ) ;
283302 if ( ! ( yield * fileSystem . exists ( worktreePath ) . pipe ( Effect . orDie ) ) ) {
284- return yield * new ProviderWorkspaceMissingError ( { threadId, cwd : worktreePath } ) ;
303+ return yield * new ProviderWorkspaceMissingError ( {
304+ threadId,
305+ cwd : worktreePath ,
306+ } ) ;
285307 }
286308 calls . push ( "session" ) ;
287309 yield * Deferred . succeed ( openEntered , undefined ) ;
@@ -306,6 +328,11 @@ it.effect.each([
306328 cleanupEntered = true ;
307329 if ( order === "cleanup-first" ) yield * Deferred . await ( release ) ;
308330 yield * fileSystem . remove ( worktreePath , { recursive : true , force : true } ) ;
331+ // A failed `git worktree remove` can leave the folder without its checkout.
332+ if ( leavesFolder ) {
333+ yield * fileSystem . makeDirectory ( worktreePath ) ;
334+ yield * fileSystem . writeFileString ( path . join ( worktreePath , "unsaved.txt" ) , "keep" ) ;
335+ }
309336 calls . push ( "cleanup" ) ;
310337 } ) ,
311338 ) ;
@@ -325,23 +352,31 @@ it.effect.each([
325352 if ( order === "rollback-first" ) assert . isFalse ( cleanupEntered ) ;
326353 yield * Deferred . succeed ( release , undefined ) ;
327354 if ( cleanup !== undefined ) yield * Fiber . join ( cleanup ) ;
328- if ( unmanaged ) {
355+ if ( unmanaged || shared ) {
329356 const error = yield * Fiber . join ( rollback ) . pipe ( Effect . flip ) ;
330357 assert . equal ( error . _tag , "CheckpointRollbackExecutionError" ) ;
331358 assert . deepEqual ( calls , [ "cleanup" ] ) ;
359+ if ( shared ) {
360+ assert . equal ( error . reason , "shared-workspace" ) ;
361+ assert . isTrue ( yield * fileSystem . exists ( path . join ( worktreePath , "unsaved.txt" ) ) ) ;
362+ }
332363 return ;
333364 }
334365 yield * Fiber . join ( rollback ) ;
335366 if ( laterCleanup !== undefined ) yield * Fiber . join ( laterCleanup ) ;
336367 const rollbackCalls = restoreFiles
337368 ? [ "session" , "files" , "projection" ]
338369 : [ "session" , "projection" ] ;
370+ const recreates = ! leavesFolder || restoreFiles ;
339371 assert . deepEqual (
340372 calls ,
341373 order === "cleanup-first"
342- ? [ "cleanup" , "prune" , "create" , ...rollbackCalls ]
374+ ? [ "cleanup" , ... ( recreates ? [ "prune" , "create" ] : [ ] ) , ...rollbackCalls ]
343375 : [ ...rollbackCalls , "cleanup" ] ,
344376 ) ;
377+ if ( ! recreates ) {
378+ assert . isTrue ( yield * fileSystem . exists ( path . join ( worktreePath , "unsaved.txt" ) ) ) ;
379+ }
345380 } ) . pipe ( Effect . provide ( testLayer ) ) ;
346381 } ) . pipe ( Effect . scoped , Effect . provide ( NodeServices . layer ) ) ,
347382) ;
0 commit comments