Centralize effective artifact selection

2026-08-10 22:27:06 +00:00
parent f39fc94610
commit af492c9e97
20 changed files with 457 additions and 130 deletions
--- a/internal/app/restore_plan.go
+++ b/internal/app/restore_plan.go
@@ -343,7 +343,11 @@ func buildPreviousCacheRestoreActions(
 	if cfg == nil || cfg.Pipeline == nil || cfg.Pipeline.Scriptorium == nil {
 		return nil, nil
 	}
-	requirements := artifacts.CollectPreviousArtifactRequirements(cfg.Pipeline.Scriptorium.Artifacts)
+	effective, err := resolveEffectiveArtifacts(cfg, nil)
+	if err != nil {
+		return nil, err
+	}
+	requirements := artifacts.CollectPreviousArtifactRequirements(cfg.Pipeline.Scriptorium.Artifacts, effective)
 	if len(requirements) == 0 {
 		return nil, nil
 	}