@@ -589,7 +589,11 @@ def test_updated_older_release_cannot_override_newer_immutable_plan(self) -> Non
589589 mock .patch .object (
590590 self .recovery ,
591591 "direct_plan_lifecycle" ,
592- side_effect = [("completed" , None ), ("completed" , None )],
592+ side_effect = [
593+ ("completed" , None ),
594+ ("completed" , None ),
595+ ("completed" , None ),
596+ ],
593597 ),
594598 mock .patch .object (
595599 self .recovery ,
@@ -607,6 +611,86 @@ def test_updated_older_release_cannot_override_newer_immutable_plan(self) -> Non
607611 self .assertEqual (tags [1 ], selected ["tag" ])
608612 self .assertEqual ("completed" , selected ["lifecycle" ])
609613
614+ def test_concurrent_terminal_supersession_retries_before_returning_action (self ) -> None :
615+ older = {"plan" : "older-plan" }
616+ successor = {"plan" : "successor-plan" }
617+ older_tag = "release-plan/older-plan"
618+ successor_tag = "release-plan/successor-plan"
619+ commits = {older_tag : "a" * 40 , successor_tag : "b" * 40 }
620+ plans = {older_tag : older , successor_tag : successor }
621+ recorded = {
622+ commits [older_tag ]: dt .datetime (2026 , 7 , 20 , tzinfo = dt .UTC ),
623+ commits [successor_tag ]: dt .datetime (2026 , 7 , 21 , tzinfo = dt .UTC ),
624+ }
625+ terminal_failure : dict [str , object ] = {}
626+ registry_reads = 0
627+
628+ def list_tags (_client : mock .Mock ) -> list [str ]:
629+ nonlocal registry_reads
630+ registry_reads += 1
631+ if registry_reads == 2 :
632+ terminal_failure .update (
633+ {"outcome" : "terminal-failure" , "successor" : successor_tag }
634+ )
635+ return (
636+ [older_tag , successor_tag ]
637+ if terminal_failure
638+ else [older_tag ]
639+ )
640+
641+ def lifecycle (
642+ _client : mock .Mock ,
643+ tag : str ,
644+ _commit : str ,
645+ _plan : dict [str , object ],
646+ _preparation : None ,
647+ ) -> tuple [str , object | None ]:
648+ if tag == older_tag and terminal_failure :
649+ return "superseded" , {
650+ "tag" : successor_tag ,
651+ "sha256" : self .recovery .manifest_digest (successor ),
652+ "plan" : successor ,
653+ }
654+ return "actionable" , None
655+
656+ with (
657+ mock .patch .object (
658+ self .recovery ,
659+ "list_release_plan_tags" ,
660+ side_effect = list_tags ,
661+ ),
662+ mock .patch .object (
663+ self .recovery ,
664+ "resolve_tag" ,
665+ side_effect = lambda _client , _repository , tag : commits [tag ],
666+ ),
667+ mock .patch .object (
668+ self .recovery ,
669+ "read_plan_authority" ,
670+ side_effect = lambda _client , tag , _commit : (plans [tag ], None ),
671+ ),
672+ mock .patch .object (
673+ self .recovery ,
674+ "direct_plan_lifecycle" ,
675+ side_effect = lifecycle ,
676+ ),
677+ mock .patch .object (
678+ self .recovery ,
679+ "immutable_plan_recorded_at" ,
680+ side_effect = lambda _client , commit : recorded [commit ],
681+ ),
682+ mock .patch .object (
683+ self .recovery ,
684+ "accepted_continuity_supersession" ,
685+ return_value = None ,
686+ ),
687+ ):
688+ selected = self .recovery .select_implicit_plan_authority (mock .Mock ())
689+
690+ self .assertEqual (successor_tag , selected ["tag" ])
691+ self .assertEqual ("actionable" , selected ["lifecycle" ])
692+ self .assertEqual (4 , registry_reads )
693+
610694 def test_interrupted_plan_rejects_multiple_continuity_successors (self ) -> None :
611695 interrupted = lifecycle_plan (self .recovery )
612696 interrupted ["plan" ] = "interrupted-plan"
0 commit comments