@@ -415,6 +415,190 @@ describe("CheckpointReactor", () => {
415415 ) . toBe ( "v2\n" ) ;
416416 } ) ;
417417
418+ it ( "refreshes an existing real checkpoint on completed turn completion without duplicating activity" , async ( ) => {
419+ const harness = await createHarness ( { seedFilesystemCheckpoints : false } ) ;
420+ const createdAt = new Date ( ) . toISOString ( ) ;
421+
422+ await Effect . runPromise (
423+ harness . engine . dispatch ( {
424+ type : "thread.session.set" ,
425+ commandId : CommandId . makeUnsafe ( "cmd-session-set-refresh-existing-checkpoint" ) ,
426+ threadId : ThreadId . makeUnsafe ( "thread-1" ) ,
427+ session : {
428+ threadId : ThreadId . makeUnsafe ( "thread-1" ) ,
429+ status : "ready" ,
430+ providerName : "codex" ,
431+ runtimeMode : "approval-required" ,
432+ activeTurnId : null ,
433+ lastError : null ,
434+ updatedAt : createdAt ,
435+ } ,
436+ createdAt,
437+ } ) ,
438+ ) ;
439+
440+ harness . provider . emit ( {
441+ type : "turn.started" ,
442+ eventId : EventId . makeUnsafe ( "evt-turn-started-refresh-existing-checkpoint" ) ,
443+ provider : "codex" ,
444+ createdAt : new Date ( ) . toISOString ( ) ,
445+ threadId : ThreadId . makeUnsafe ( "thread-1" ) ,
446+ turnId : asTurnId ( "turn-refresh" ) ,
447+ } ) ;
448+ await waitForGitRefExists (
449+ harness . cwd ,
450+ checkpointRefForThreadTurn ( ThreadId . makeUnsafe ( "thread-1" ) , 0 ) ,
451+ ) ;
452+
453+ fs . writeFileSync ( path . join ( harness . cwd , "README.md" ) , "v2\n" , "utf8" ) ;
454+ await Effect . runPromise (
455+ harness . engine . dispatch ( {
456+ type : "thread.turn.diff.complete" ,
457+ commandId : CommandId . makeUnsafe ( "cmd-placeholder-diff-refresh-existing-checkpoint" ) ,
458+ threadId : ThreadId . makeUnsafe ( "thread-1" ) ,
459+ turnId : asTurnId ( "turn-refresh" ) ,
460+ completedAt : new Date ( ) . toISOString ( ) ,
461+ checkpointRef : checkpointRefForThreadTurn ( ThreadId . makeUnsafe ( "thread-1" ) , 1 ) ,
462+ status : "missing" ,
463+ files : [ ] ,
464+ checkpointTurnCount : 1 ,
465+ createdAt : new Date ( ) . toISOString ( ) ,
466+ } ) ,
467+ ) ;
468+
469+ await waitForGitRefExists (
470+ harness . cwd ,
471+ checkpointRefForThreadTurn ( ThreadId . makeUnsafe ( "thread-1" ) , 1 ) ,
472+ ) ;
473+ expect (
474+ gitShowFileAtRef (
475+ harness . cwd ,
476+ checkpointRefForThreadTurn ( ThreadId . makeUnsafe ( "thread-1" ) , 1 ) ,
477+ "README.md" ,
478+ ) ,
479+ ) . toBe ( "v2\n" ) ;
480+
481+ fs . writeFileSync ( path . join ( harness . cwd , "README.md" ) , "v3\n" , "utf8" ) ;
482+ harness . provider . emit ( {
483+ type : "turn.completed" ,
484+ eventId : EventId . makeUnsafe ( "evt-turn-completed-refresh-existing-checkpoint" ) ,
485+ provider : "codex" ,
486+ createdAt : new Date ( ) . toISOString ( ) ,
487+ threadId : ThreadId . makeUnsafe ( "thread-1" ) ,
488+ turnId : asTurnId ( "turn-refresh" ) ,
489+ payload : { state : "completed" } ,
490+ } ) ;
491+
492+ await harness . drain ( ) ;
493+ expect (
494+ gitShowFileAtRef (
495+ harness . cwd ,
496+ checkpointRefForThreadTurn ( ThreadId . makeUnsafe ( "thread-1" ) , 1 ) ,
497+ "README.md" ,
498+ ) ,
499+ ) . toBe ( "v3\n" ) ;
500+
501+ const readModel = await Effect . runPromise ( harness . engine . getReadModel ( ) ) ;
502+ const thread = readModel . threads . find ( ( entry ) => entry . id === ThreadId . makeUnsafe ( "thread-1" ) ) ;
503+ expect ( thread ?. checkpoints ) . toHaveLength ( 1 ) ;
504+ expect ( thread ?. checkpoints [ 0 ] ?. checkpointTurnCount ) . toBe ( 1 ) ;
505+ expect (
506+ thread ?. activities . filter ( ( activity ) => activity . kind === "checkpoint.captured" ) ,
507+ ) . toHaveLength ( 1 ) ;
508+ } ) ;
509+
510+ it ( "does not refresh an existing real checkpoint for non-completed turn completion" , async ( ) => {
511+ const harness = await createHarness ( { seedFilesystemCheckpoints : false } ) ;
512+ const createdAt = new Date ( ) . toISOString ( ) ;
513+
514+ await Effect . runPromise (
515+ harness . engine . dispatch ( {
516+ type : "thread.session.set" ,
517+ commandId : CommandId . makeUnsafe ( "cmd-session-set-skip-refresh-interrupted" ) ,
518+ threadId : ThreadId . makeUnsafe ( "thread-1" ) ,
519+ session : {
520+ threadId : ThreadId . makeUnsafe ( "thread-1" ) ,
521+ status : "ready" ,
522+ providerName : "codex" ,
523+ runtimeMode : "approval-required" ,
524+ activeTurnId : null ,
525+ lastError : null ,
526+ updatedAt : createdAt ,
527+ } ,
528+ createdAt,
529+ } ) ,
530+ ) ;
531+
532+ harness . provider . emit ( {
533+ type : "turn.started" ,
534+ eventId : EventId . makeUnsafe ( "evt-turn-started-skip-refresh-interrupted" ) ,
535+ provider : "codex" ,
536+ createdAt : new Date ( ) . toISOString ( ) ,
537+ threadId : ThreadId . makeUnsafe ( "thread-1" ) ,
538+ turnId : asTurnId ( "turn-interrupted-refresh" ) ,
539+ } ) ;
540+ await waitForGitRefExists (
541+ harness . cwd ,
542+ checkpointRefForThreadTurn ( ThreadId . makeUnsafe ( "thread-1" ) , 0 ) ,
543+ ) ;
544+
545+ fs . writeFileSync ( path . join ( harness . cwd , "README.md" ) , "v2\n" , "utf8" ) ;
546+ await Effect . runPromise (
547+ harness . engine . dispatch ( {
548+ type : "thread.turn.diff.complete" ,
549+ commandId : CommandId . makeUnsafe ( "cmd-placeholder-diff-skip-refresh-interrupted" ) ,
550+ threadId : ThreadId . makeUnsafe ( "thread-1" ) ,
551+ turnId : asTurnId ( "turn-interrupted-refresh" ) ,
552+ completedAt : new Date ( ) . toISOString ( ) ,
553+ checkpointRef : checkpointRefForThreadTurn ( ThreadId . makeUnsafe ( "thread-1" ) , 1 ) ,
554+ status : "missing" ,
555+ files : [ ] ,
556+ checkpointTurnCount : 1 ,
557+ createdAt : new Date ( ) . toISOString ( ) ,
558+ } ) ,
559+ ) ;
560+
561+ await waitForGitRefExists (
562+ harness . cwd ,
563+ checkpointRefForThreadTurn ( ThreadId . makeUnsafe ( "thread-1" ) , 1 ) ,
564+ ) ;
565+ expect (
566+ gitShowFileAtRef (
567+ harness . cwd ,
568+ checkpointRefForThreadTurn ( ThreadId . makeUnsafe ( "thread-1" ) , 1 ) ,
569+ "README.md" ,
570+ ) ,
571+ ) . toBe ( "v2\n" ) ;
572+
573+ fs . writeFileSync ( path . join ( harness . cwd , "README.md" ) , "v3\n" , "utf8" ) ;
574+ harness . provider . emit ( {
575+ type : "turn.completed" ,
576+ eventId : EventId . makeUnsafe ( "evt-turn-completed-skip-refresh-interrupted" ) ,
577+ provider : "codex" ,
578+ createdAt : new Date ( ) . toISOString ( ) ,
579+ threadId : ThreadId . makeUnsafe ( "thread-1" ) ,
580+ turnId : asTurnId ( "turn-interrupted-refresh" ) ,
581+ payload : { state : "interrupted" } ,
582+ } ) ;
583+
584+ await harness . drain ( ) ;
585+ expect (
586+ gitShowFileAtRef (
587+ harness . cwd ,
588+ checkpointRefForThreadTurn ( ThreadId . makeUnsafe ( "thread-1" ) , 1 ) ,
589+ "README.md" ,
590+ ) ,
591+ ) . toBe ( "v2\n" ) ;
592+
593+ const readModel = await Effect . runPromise ( harness . engine . getReadModel ( ) ) ;
594+ const thread = readModel . threads . find ( ( entry ) => entry . id === ThreadId . makeUnsafe ( "thread-1" ) ) ;
595+ expect ( thread ?. checkpoints ) . toHaveLength ( 1 ) ;
596+ expect ( thread ?. checkpoints [ 0 ] ?. checkpointTurnCount ) . toBe ( 1 ) ;
597+ expect (
598+ thread ?. activities . filter ( ( activity ) => activity . kind === "checkpoint.captured" ) ,
599+ ) . toHaveLength ( 1 ) ;
600+ } ) ;
601+
418602 it ( "ignores auxiliary thread turn completion while primary turn is active" , async ( ) => {
419603 const harness = await createHarness ( { seedFilesystemCheckpoints : false } ) ;
420604 const createdAt = new Date ( ) . toISOString ( ) ;
0 commit comments