@@ -338,19 +338,36 @@ describe.each([[RepoPerTaskCheckpointService, "RepoPerTaskCheckpointService"]])(
338338 } ,
339339 )
340340
341- it . each ( [ "missing" , "blob" ] ) ( "rejects a %s object before cleanup" , async ( kind ) => {
341+ it . each ( [
342+ [ "missing" , / c o u l d n o t g e t o b j e c t i n f o / i] ,
343+ [ "blob" , "Checkpoint hash does not identify a commit" ] ,
344+ ] as const ) ( "rejects a %s object before cleanup" , async ( kind , expectedError ) => {
342345 service . on ( "error" , vitest . fn ( ) )
343346 const git = service [ "git" ] !
344347 const hash = kind === "blob" ? await git . revparse ( [ "HEAD:test.txt" ] ) : "a" . repeat ( 40 )
345348 const read = vitest . spyOn ( fs , "readFile" )
346349 const clean = vitest . spyOn ( git , "clean" )
347350 const reset = vitest . spyOn ( git , "reset" )
348- await expect ( service . restoreCheckpoint ( hash ) ) . rejects . toThrow ( )
351+ await expect ( service . restoreCheckpoint ( hash ) ) . rejects . toThrow ( expectedError )
349352 expect ( read ) . not . toHaveBeenCalled ( )
350353 expect ( clean ) . not . toHaveBeenCalled ( )
351354 expect ( reset ) . not . toHaveBeenCalled ( )
352355 } )
353356
357+ it ( "still resets tracked files when removing an untracked file fails" , async ( ) => {
358+ service . on ( "error" , vitest . fn ( ) )
359+ const checkpoint = await service . saveCheckpoint ( "tracked state" , { allowEmpty : true } )
360+ await fs . writeFile ( testFile , "modified" )
361+ const untracked = path . join ( service . workspaceDir , "stuck-untracked.txt" )
362+ await fs . writeFile ( untracked , "stuck" )
363+ const rm = vitest
364+ . spyOn ( fs , "rm" )
365+ . mockRejectedValue ( Object . assign ( new Error ( "busy" ) , { code : "EBUSY" } ) )
366+ await service . restoreCheckpoint ( checkpoint ! . commit )
367+ rm . mockRestore ( )
368+ expect ( await fs . readFile ( testFile , "utf8" ) ) . toBe ( "Hello, world!" )
369+ } )
370+
354371 it ( "records files ignored before initialization for a baseHash restore" , async ( ) => {
355372 const gitignore = path . join ( service . workspaceDir , ".gitignore" )
356373 const secret = path . join ( service . workspaceDir , "initial-secret.txt" )
@@ -395,7 +412,13 @@ describe.each([[RepoPerTaskCheckpointService, "RepoPerTaskCheckpointService"]])(
395412 . spyOn ( fs , "readFile" )
396413 . mockRejectedValueOnce ( Object . assign ( new Error ( "denied" ) , { code : "EACCES" } ) )
397414 }
398- await expect ( service . restoreCheckpoint ( checkpoint ! . commit ) ) . rejects . toThrow ( )
415+ const expectedError = {
416+ missing : / E N O E N T | n o s u c h f i l e / i,
417+ truncated : SyntaxError ,
418+ invalid : "Invalid ignored-path record" ,
419+ unreadable : "denied" ,
420+ } [ failure ]
421+ await expect ( service . restoreCheckpoint ( checkpoint ! . commit ) ) . rejects . toThrow ( expectedError )
399422 expect ( await fs . readFile ( testFile , "utf8" ) ) . toBe ( "must not reset" )
400423 expect ( await fs . readFile ( untracked , "utf8" ) ) . toBe ( "must not clean" )
401424 } ,
0 commit comments